<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195909] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195909">195909</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-01-30 13:39:00 -0800 (Sat, 30 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/195871">r195871</a>.
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</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195908 => 195909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-30 21:34:43 UTC (rev 195908)
+++ trunk/Source/WebCore/ChangeLog 2016-01-30 21:39:00 UTC (rev 195909)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-01-30 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Unreviewed, rebaseline bindings tests after r195904.
</span><span class="cx">
</span><span class="cx"> * bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (195908 => 195909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2016-01-30 21:34:43 UTC (rev 195908)
+++ trunk/Source/WebCore/page/Page.cpp 2016-01-30 21:39:00 UTC (rev 195909)
</span><span class="lines">@@ -1305,7 +1305,10 @@
</span><span class="cx"> {
</span><span class="cx"> chrome().client().setPageActivityState(activityState);
</span><span class="cx">
</span><del>- updateTabSuspensionState();
</del><ins>+ if (activityState == PageActivityState::NoFlags && !isVisible())
+ scheduleTabSuspension(true);
+ else
+ scheduleTabSuspension(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::setIsVisible(bool isVisible)
</span><span class="lines">@@ -1358,7 +1361,7 @@
</span><span class="cx"> view->hide();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateTabSuspensionState();
</del><ins>+ scheduleTabSuspension(!isVisible);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::setIsPrerender()
</span><span class="lines">@@ -1864,29 +1867,17 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (m_isPrerender)
</span><span class="cx"> return false;
</span><del>- if (isVisible())
- return false;
</del><span class="cx"> if (m_pageThrottler.activityState() != PageActivityState::NoFlags)
</span><span class="cx"> return false;
</span><ins>+ // 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;
</ins><span class="cx">
</span><del>- 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;
- }
-
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::setIsTabSuspended(bool shouldSuspend)
</span><span class="cx"> {
</span><del>- if (m_isTabSuspended == shouldSuspend)
- return;
- m_isTabSuspended = shouldSuspend;
-
</del><span class="cx"> for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> if (auto* document = frame->document()) {
</span><span class="cx"> if (shouldSuspend)
</span><span class="lines">@@ -1902,19 +1893,26 @@
</span><span class="cx"> s_tabSuspensionIsEnabled = enable;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::updateTabSuspensionState()
</del><ins>+void Page::scheduleTabSuspension(bool shouldSuspend)
</ins><span class="cx"> {
</span><del>- if (canTabSuspend()) {
- m_tabSuspensionTimer.startOneShot(0);
</del><ins>+ if (m_shouldTabSuspend == shouldSuspend)
</ins><span class="cx"> return;
</span><ins>+
+ if (shouldSuspend && canTabSuspend()) {
+ m_shouldTabSuspend = shouldSuspend;
+ m_tabSuspensionTimer.startOneShot(0);
+ } else {
+ m_tabSuspensionTimer.stop();
+ if (!shouldSuspend) {
+ m_shouldTabSuspend = shouldSuspend;
+ setIsTabSuspended(false);
+ }
</ins><span class="cx"> }
</span><del>- m_tabSuspensionTimer.stop();
- setIsTabSuspended(false);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::tabSuspensionTimerFired()
</span><span class="cx"> {
</span><del>- setIsTabSuspended(canTabSuspend());
</del><ins>+ setIsTabSuspended(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (195908 => 195909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2016-01-30 21:34:43 UTC (rev 195908)
+++ trunk/Source/WebCore/page/Page.h 2016-01-30 21:39:00 UTC (rev 195909)
</span><span class="lines">@@ -521,7 +521,7 @@
</span><span class="cx"> void hiddenPageDOMTimerThrottlingStateChanged();
</span><span class="cx"> void setTimerThrottlingEnabled(bool);
</span><span class="cx"> bool canTabSuspend();
</span><del>- void updateTabSuspensionState();
</del><ins>+ void scheduleTabSuspension(bool);
</ins><span class="cx"> void tabSuspensionTimerFired();
</span><span class="cx">
</span><span class="cx"> const std::unique_ptr<Chrome> m_chrome;
</span><span class="lines">@@ -663,7 +663,7 @@
</span><span class="cx"> SessionID m_sessionID;
</span><span class="cx">
</span><span class="cx"> bool m_isClosing;
</span><del>- bool m_isTabSuspended { false };
</del><ins>+ bool m_shouldTabSuspend { false };
</ins><span class="cx"> Timer m_tabSuspensionTimer;
</span><span class="cx">
</span><span class="cx"> MediaProducer::MediaStateFlags m_mediaState { MediaProducer::IsNotPlaying };
</span></span></pre>
</div>
</div>
</body>
</html>