Changeset 195909 in webkit

Timestamp:

Jan 30, 2016 1:39:00 PM (8 years ago)

Author:

Chris Dumez

Message:

Unreviewed, rolling out r195871.

Caused several layout tests to time out

Reverted changeset:

"Tab suspension code shouldn't use page cache cacheability
logic"
​https://bugs.webkit.org/show_bug.cgi?id=153680
​http://trac.webkit.org/changeset/195871

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Page.cpp (modified) (5 diffs)
• page/Page.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-30  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, rolling out r195871.
+
+        Caused several layout tests to time out
+
+        Reverted changeset:
+
+        "Tab suspension code shouldn't use page cache cacheability
+        logic"
+        https://bugs.webkit.org/show_bug.cgi?id=153680
+        http://trac.webkit.org/changeset/195871
+
 2016-01-30  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/page/Page.cpp

@@ -1306 +1306 @@
     chrome().client().setPageActivityState(activityState);
     
-    updateTabSuspensionState();
+    if (activityState == PageActivityState::NoFlags && !isVisible())
+        scheduleTabSuspension(true);
+    else
+        scheduleTabSuspension(false);
 }
 
@@ -1359 +1362 @@
     }
 
-    updateTabSuspensionState();
+    scheduleTabSuspension(!isVisible);
 }
 
@@ -1865 +1868 @@
     if (m_isPrerender)
         return false;
-    if (isVisible())
-        return false;
     if (m_pageThrottler.activityState() != PageActivityState::NoFlags)
         return false;
-
-    for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
-        if (frame->loader().state() == FrameStateProvisional)
-            return false;
-        if (frame->loader().isLoading())
-            return false;
-        if (!frame->document() || !frame->document()->canSuspendActiveDOMObjectsForDocumentSuspension(nullptr))
-            return false;
-    }
+    // FIXME: PageCache::canCache does a bunch of checks that are not needed for the tab suspension case. There should be a specific check.
+    if (!PageCache::singleton().canCache(*this))
+        return false;
 
     return true;
@@ -1884 +1879 @@
 void Page::setIsTabSuspended(bool shouldSuspend)
 {
-    if (m_isTabSuspended == shouldSuspend)
-        return;
-    m_isTabSuspended = shouldSuspend;
-
     for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (auto* document = frame->document()) {
@@ -1903 +1894 @@
 }
 
-void Page::updateTabSuspensionState()
-{
-    if (canTabSuspend()) {
+void Page::scheduleTabSuspension(bool shouldSuspend)
+{
+    if (m_shouldTabSuspend == shouldSuspend)
+        return;
+    
+    if (shouldSuspend && canTabSuspend()) {
+        m_shouldTabSuspend = shouldSuspend;
         m_tabSuspensionTimer.startOneShot(0);
-        return;
-    }
-    m_tabSuspensionTimer.stop();
-    setIsTabSuspended(false);
+    } else {
+        m_tabSuspensionTimer.stop();
+        if (!shouldSuspend) {
+            m_shouldTabSuspend = shouldSuspend;
+            setIsTabSuspended(false);
+        }
+    }
 }
 
 void Page::tabSuspensionTimerFired()
 {
-    setIsTabSuspended(canTabSuspend());
+    setIsTabSuspended(true);
 }
 

trunk/Source/WebCore/page/Page.h

@@ -522 +522 @@
     void setTimerThrottlingEnabled(bool);
     bool canTabSuspend();
-    void updateTabSuspensionState();
+    void scheduleTabSuspension(bool);
     void tabSuspensionTimerFired();
 
@@ -664 +664 @@
 
     bool m_isClosing;
-    bool m_isTabSuspended { false };
+    bool m_shouldTabSuspend { false };
     Timer m_tabSuspensionTimer;