<!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>[195790] 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/195790">195790</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-01-28 15:30:45 -0800 (Thu, 28 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tab suspension code hits asserts
Reviewed by Chris Dumez.
Enabling tab suspension and navigating around in a few tabs hits an assert in
ScriptExecutionContext::suspendActiveDOMObject. This is because suspend/resume reasons don't pair properly
* dom/Document.cpp:
(WebCore::Document::documentWillBecomeInactive):
(WebCore::Document::suspend):
(WebCore::Document::resume):
Provide the reason as argument.
* dom/Document.h:
* history/CachedFrame.cpp:
(WebCore::CachedFrameBase::restore):
No need to call resumeActiveDOMObjects/resumeScriptedAnimationControllerCallbacks explicitly as Document::resume does that.
(WebCore::CachedFrame::CachedFrame):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::commitProvisionalLoad):
* page/Page.cpp:
(WebCore::Page::canTabSuspend):
(WebCore::Page::setIsTabSuspended):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCorehistoryCachedFramecpp">trunk/Source/WebCore/history/CachedFrame.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195789 => 195790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-28 23:28:37 UTC (rev 195789)
+++ trunk/Source/WebCore/ChangeLog 2016-01-28 23:30:45 UTC (rev 195790)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-01-28 Antti Koivisto <antti@apple.com>
+
+ Tab suspension code hits asserts
+
+
+ Reviewed by Chris Dumez.
+
+ Enabling tab suspension and navigating around in a few tabs hits an assert in
+ ScriptExecutionContext::suspendActiveDOMObject. This is because suspend/resume reasons don't pair properly
+
+ * dom/Document.cpp:
+ (WebCore::Document::documentWillBecomeInactive):
+ (WebCore::Document::suspend):
+ (WebCore::Document::resume):
+
+ Provide the reason as argument.
+
+ * dom/Document.h:
+ * history/CachedFrame.cpp:
+ (WebCore::CachedFrameBase::restore):
+
+ No need to call resumeActiveDOMObjects/resumeScriptedAnimationControllerCallbacks explicitly as Document::resume does that.
+
+ (WebCore::CachedFrame::CachedFrame):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::commitProvisionalLoad):
+ * page/Page.cpp:
+ (WebCore::Page::canTabSuspend):
+ (WebCore::Page::setIsTabSuspended):
+
</ins><span class="cx"> 2016-01-28 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Fix several more problems with object store changes during cursor iteration in SQLite backend.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (195789 => 195790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-01-28 23:28:37 UTC (rev 195789)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-01-28 23:30:45 UTC (rev 195790)
</span><span class="lines">@@ -4655,7 +4655,7 @@
</span><span class="cx"> renderView()->setIsInWindow(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::suspend()
</del><ins>+void Document::suspend(ActiveDOMObject::ReasonForSuspension reason)
</ins><span class="cx"> {
</span><span class="cx"> if (m_isSuspended)
</span><span class="cx"> return;
</span><span class="lines">@@ -4680,7 +4680,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> suspendScriptedAnimationControllerCallbacks();
</span><del>- suspendActiveDOMObjects(ActiveDOMObject::PageCache);
</del><ins>+ suspendActiveDOMObjects(reason);
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_frame);
</span><span class="cx"> m_frame->clearTimers();
</span><span class="lines">@@ -4691,7 +4691,7 @@
</span><span class="cx"> m_isSuspended = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::resume()
</del><ins>+void Document::resume(ActiveDOMObject::ReasonForSuspension reason)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_isSuspended)
</span><span class="cx"> return;
</span><span class="lines">@@ -4711,7 +4711,7 @@
</span><span class="cx"> m_frame->loader().client().dispatchDidBecomeFrameset(isFrameSet());
</span><span class="cx"> m_frame->animation().resumeAnimationsForDocument(this);
</span><span class="cx">
</span><del>- resumeActiveDOMObjects(ActiveDOMObject::PageWillBeSuspended);
</del><ins>+ resumeActiveDOMObjects(reason);
</ins><span class="cx"> resumeScriptedAnimationControllerCallbacks();
</span><span class="cx">
</span><span class="cx"> m_visualUpdatesAllowed = true;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (195789 => 195790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2016-01-28 23:28:37 UTC (rev 195789)
+++ trunk/Source/WebCore/dom/Document.h 2016-01-28 23:30:45 UTC (rev 195790)
</span><span class="lines">@@ -1011,8 +1011,8 @@
</span><span class="cx"> void unregisterForDocumentSuspensionCallbacks(Element*);
</span><span class="cx">
</span><span class="cx"> void documentWillBecomeInactive();
</span><del>- void suspend();
- void resume();
</del><ins>+ void suspend(ActiveDOMObject::ReasonForSuspension);
+ void resume(ActiveDOMObject::ReasonForSuspension);
</ins><span class="cx">
</span><span class="cx"> void registerForMediaVolumeCallbacks(Element*);
</span><span class="cx"> void unregisterForMediaVolumeCallbacks(Element*);
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryCachedFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/CachedFrame.cpp (195789 => 195790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/CachedFrame.cpp 2016-01-28 23:28:37 UTC (rev 195789)
+++ trunk/Source/WebCore/history/CachedFrame.cpp 2016-01-28 23:30:45 UTC (rev 195790)
</span><span class="lines">@@ -92,9 +92,9 @@
</span><span class="cx"> m_document->accessSVGExtensions().unpauseAnimations();
</span><span class="cx">
</span><span class="cx"> frame.animation().resumeAnimationsForDocument(m_document.get());
</span><del>- m_document->resumeActiveDOMObjects(ActiveDOMObject::PageCache);
- m_document->resumeScriptedAnimationControllerCallbacks();
</del><span class="cx">
</span><ins>+ m_document->resume(ActiveDOMObject::PageCache);
+
</ins><span class="cx"> // It is necessary to update any platform script objects after restoring the
</span><span class="cx"> // cached page.
</span><span class="cx"> frame.script().updatePlatformScriptObjects();
</span><span class="lines">@@ -135,7 +135,6 @@
</span><span class="cx"> m_document->page()->chrome().client().needTouchEvents(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_document->resume();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CachedFrame::CachedFrame(Frame& frame)
</span><span class="lines">@@ -161,7 +160,7 @@
</span><span class="cx"> m_childFrames.append(std::make_unique<CachedFrame>(*child));
</span><span class="cx">
</span><span class="cx"> // Active DOM objects must be suspended before we cache the frame script data.
</span><del>- m_document->suspend();
</del><ins>+ m_document->suspend(ActiveDOMObject::PageCache);
</ins><span class="cx">
</span><span class="cx"> m_cachedFrameScriptData = std::make_unique<ScriptCachedFrameData>(frame);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (195789 => 195790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-01-28 23:28:37 UTC (rev 195789)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-01-28 23:30:45 UTC (rev 195790)
</span><span class="lines">@@ -1845,7 +1845,7 @@
</span><span class="cx"> if (m_frame.document()->doctype() && m_frame.page())
</span><span class="cx"> m_frame.page()->chrome().didReceiveDocType(&m_frame);
</span><span class="cx"> #endif
</span><del>- m_frame.document()->resume();
</del><ins>+ m_frame.document()->resume(ActiveDOMObject::PageCache);
</ins><span class="cx">
</span><span class="cx"> // Force a layout to update view size and thereby update scrollbars.
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (195789 => 195790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2016-01-28 23:28:37 UTC (rev 195789)
+++ trunk/Source/WebCore/page/Page.cpp 2016-01-28 23:30:45 UTC (rev 195790)
</span><span class="lines">@@ -1863,7 +1863,17 @@
</span><span class="cx">
</span><span class="cx"> bool Page::canTabSuspend()
</span><span class="cx"> {
</span><del>- return s_tabSuspensionIsEnabled && !m_isPrerender && (m_pageThrottler.activityState() == PageActivityState::NoFlags) && PageCache::singleton().canCache(*this);
</del><ins>+ if (!s_tabSuspensionIsEnabled)
+ return false;
+ if (m_isPrerender)
+ return false;
+ if (m_pageThrottler.activityState() != PageActivityState::NoFlags)
+ 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;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::setIsTabSuspended(bool shouldSuspend)
</span><span class="lines">@@ -1871,9 +1881,9 @@
</span><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><del>- document->suspend();
</del><ins>+ document->suspend(ActiveDOMObject::PageWillBeSuspended);
</ins><span class="cx"> else
</span><del>- document->resume();
</del><ins>+ document->resume(ActiveDOMObject::PageWillBeSuspended);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>