From: commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed, 9 Mar 2016 21:31:03 +0000 (+0000)
Subject: Unreviewed, rolling out r197698.
X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=ba8a4a4d3468ef2b6f1169b4477252a21105b24e;ds=sidebyside

Unreviewed, rolling out r197698.
https://bugs.webkit.org/show_bug.cgi?id=155252

Caused assertions, and wasn't reviewed by a WK2 owner
(Requested by andersca on #webkit).

Reverted changeset:

"Last opened tab does not receive
SetHiddenPageTimerThrottlingIncreaseLimit message"
https://bugs.webkit.org/show_bug.cgi?id=155126
http://trac.webkit.org/changeset/197698

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@197882 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 8b11318..48771ec 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2016-03-09  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r197698.
+        https://bugs.webkit.org/show_bug.cgi?id=155252
+
+        Caused assertions, and wasn't reviewed by a WK2 owner
+        (Requested by andersca on #webkit).
+
+        Reverted changeset:
+
+        "Last opened tab does not receive
+        SetHiddenPageTimerThrottlingIncreaseLimit message"
+        https://bugs.webkit.org/show_bug.cgi?id=155126
+        http://trac.webkit.org/changeset/197698
+
 2016-03-09  Conrad Shultz  <conrad_shultz@apple.com>
 
         WebsiteDataStore::Configuration::legacyWebsiteDataStoreConfiguration() should respect the passed-in configuration
diff --git a/Source/WebKit2/UIProcess/WebProcessPool.cpp b/Source/WebKit2/UIProcess/WebProcessPool.cpp
index f13f1db..1eed515 100644
--- a/Source/WebKit2/UIProcess/WebProcessPool.cpp
+++ b/Source/WebKit2/UIProcess/WebProcessPool.cpp
@@ -163,8 +163,7 @@ WebProcessPool::WebProcessPool(API::ProcessPoolConfiguration& configuration)
     , m_memoryCacheDisabled(false)
     , m_userObservablePageCounter([this](RefCounterEvent) { updateProcessSuppressionState(); })
     , m_processSuppressionDisabledForPageCounter([this](RefCounterEvent) { updateProcessSuppressionState(); })
-    , m_hiddenPageThrottlingAutoIncreasesCounter([this](RefCounterEvent) { m_hiddenPageThrottlingTimer.startOneShot(0); })
-    , m_hiddenPageThrottlingTimer(*this, &WebProcessPool::updateHiddenPageThrottlingAutoIncreaseLimit)
+    , m_hiddenPageThrottlingAutoIncreasesCounter([this](RefCounterEvent) { updateHiddenPageThrottlingAutoIncreaseLimit(); })
 {
     for (auto& scheme : m_configuration->alwaysRevalidatedURLSchemes())
         m_schemesToRegisterAsAlwaysRevalidated.add(scheme);
diff --git a/Source/WebKit2/UIProcess/WebProcessPool.h b/Source/WebKit2/UIProcess/WebProcessPool.h
index df15884..f6a5117 100644
--- a/Source/WebKit2/UIProcess/WebProcessPool.h
+++ b/Source/WebKit2/UIProcess/WebProcessPool.h
@@ -522,7 +522,6 @@ private:
     UserObservablePageCounter m_userObservablePageCounter;
     ProcessSuppressionDisabledCounter m_processSuppressionDisabledForPageCounter;
     HiddenPageThrottlingAutoIncreasesCounter m_hiddenPageThrottlingAutoIncreasesCounter;
-    WebCore::Timer m_hiddenPageThrottlingTimer;
 
 #if PLATFORM(COCOA)
     RetainPtr<NSMutableDictionary> m_bundleParameters;