<!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>[205805] 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/205805">205805</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-09-12 02:26:19 -0700 (Mon, 12 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Start using Document::pageCacheState() instead of Document::inPageCache()
https://bugs.webkit.org/show_bug.cgi?id=161851
Reviewed by Ryosuke Niwa.
Start using Document::pageCacheState() instead of Document::inPageCache()
as the latter one is confusing (given that it is true when firing the
pagehide event, when the document is about to enter page cache).
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::closeURL):
(WebCore::FrameLoader::clear):
(WebCore::FrameLoader::dispatchUnloadEvents):
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::load):
* page/Page.cpp:
(WebCore::incrementFrame): Deleted.
* page/Page.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</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 (205804 => 205805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-12 08:09:49 UTC (rev 205804)
+++ trunk/Source/WebCore/ChangeLog 2016-09-12 09:26:19 UTC (rev 205805)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-09-12 Chris Dumez <cdumez@apple.com>
+
+ Start using Document::pageCacheState() instead of Document::inPageCache()
+ https://bugs.webkit.org/show_bug.cgi?id=161851
+
+ Reviewed by Ryosuke Niwa.
+
+ Start using Document::pageCacheState() instead of Document::inPageCache()
+ as the latter one is confusing (given that it is true when firing the
+ pagehide event, when the document is about to enter page cache).
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::closeURL):
+ (WebCore::FrameLoader::clear):
+ (WebCore::FrameLoader::dispatchUnloadEvents):
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::load):
+ * page/Page.cpp:
+ (WebCore::incrementFrame): Deleted.
+ * page/Page.h:
+
</ins><span class="cx"> 2016-09-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> HTMLTrackElement.kind's invalid value default should be the metadata state
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (205804 => 205805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-09-12 08:09:49 UTC (rev 205804)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-09-12 09:26:19 UTC (rev 205805)
</span><span class="lines">@@ -517,7 +517,7 @@
</span><span class="cx"> unloadEventPolicy = UnloadEventPolicyNone;
</span><span class="cx"> } else {
</span><span class="cx"> // Should only send the pagehide event here if the current document exists and has not been placed in the page cache.
</span><del>- unloadEventPolicy = currentDocument && !currentDocument->inPageCache() ? UnloadEventPolicyUnloadAndPageHide : UnloadEventPolicyUnloadOnly;
</del><ins>+ unloadEventPolicy = currentDocument && currentDocument->pageCacheState() == Document::NotInPageCache ? UnloadEventPolicyUnloadAndPageHide : UnloadEventPolicyUnloadOnly;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> stopLoading(unloadEventPolicy);
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> return;
</span><span class="cx"> m_needsClear = false;
</span><span class="cx">
</span><del>- if (!m_frame.document()->inPageCache()) {
</del><ins>+ if (m_frame.document()->pageCacheState() != Document::InPageCache) {
</ins><span class="cx"> m_frame.document()->cancelParsing();
</span><span class="cx"> m_frame.document()->stopActiveDOMObjects();
</span><span class="cx"> bool hadLivingRenderTree = m_frame.document()->hasLivingRenderTree();
</span><span class="lines">@@ -603,7 +603,7 @@
</span><span class="cx"> if (clearWindowProperties) {
</span><span class="cx"> InspectorInstrumentation::frameWindowDiscarded(&m_frame, m_frame.document()->domWindow());
</span><span class="cx"> m_frame.document()->domWindow()->resetUnlessSuspendedForDocumentSuspension();
</span><del>- m_frame.script().clearWindowShell(newDocument->domWindow(), m_frame.document()->inPageCache());
</del><ins>+ m_frame.script().clearWindowShell(newDocument->domWindow(), m_frame.document()->pageCacheState() == Document::AboutToEnterPageCache);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_frame.selection().prepareForDestruction();
</span><span class="lines">@@ -2924,13 +2924,13 @@
</span><span class="cx"> if (m_pageDismissalEventBeingDispatched == PageDismissalType::None) {
</span><span class="cx"> if (unloadEventPolicy == UnloadEventPolicyUnloadAndPageHide) {
</span><span class="cx"> m_pageDismissalEventBeingDispatched = PageDismissalType::PageHide;
</span><del>- m_frame.document()->domWindow()->dispatchEvent(PageTransitionEvent::create(eventNames().pagehideEvent, m_frame.document()->inPageCache()), m_frame.document());
</del><ins>+ m_frame.document()->domWindow()->dispatchEvent(PageTransitionEvent::create(eventNames().pagehideEvent, m_frame.document()->pageCacheState() == Document::AboutToEnterPageCache), m_frame.document());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: update Page Visibility state here.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=116770
</span><span class="cx">
</span><del>- if (!m_frame.document()->inPageCache()) {
</del><ins>+ if (m_frame.document()->pageCacheState() == Document::NotInPageCache) {
</ins><span class="cx"> Ref<Event> unloadEvent(Event::create(eventNames().unloadEvent, false, false));
</span><span class="cx"> // The DocumentLoader (and thus its LoadTiming) might get destroyed
</span><span class="cx"> // while dispatching the event, so protect it to prevent writing the end
</span><span class="lines">@@ -2956,7 +2956,7 @@
</span><span class="cx"> if (!m_frame.document())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_frame.document()->inPageCache())
</del><ins>+ if (m_frame.document()->pageCacheState() != Document::NotInPageCache)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Don't remove event listeners from a transitional empty document (see bug 28716 for more information).
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (205804 => 205805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-09-12 08:09:49 UTC (rev 205804)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-09-12 09:26:19 UTC (rev 205805)
</span><span class="lines">@@ -268,9 +268,14 @@
</span><span class="cx"> Frame& frame = *cachedResourceLoader.frame();
</span><span class="cx">
</span><span class="cx"> // Prevent new loads if we are in the PageCache or being added to the PageCache.
</span><del>- if (frame.page() && frame.page()->inPageCache()) {
- failBeforeStarting();
- return;
</del><ins>+ // We query the top document because new frames may be created in pagehide event handlers
+ // and their pageCacheState will not reflect the fact that they are about to enter page
+ // cache.
+ if (auto* topDocument = frame.mainFrame().document()) {
+ if (topDocument->pageCacheState() != Document::NotInPageCache) {
+ failBeforeStarting();
+ return;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FrameLoader& frameLoader = frame.loader();
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (205804 => 205805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2016-09-12 08:09:49 UTC (rev 205804)
+++ trunk/Source/WebCore/page/Page.cpp 2016-09-12 09:26:19 UTC (rev 205805)
</span><span class="lines">@@ -579,12 +579,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Page::inPageCache() const
-{
- auto* document = mainFrame().document();
- return document && document->inPageCache();
-}
-
</del><span class="cx"> static Frame* incrementFrame(Frame* curr, bool forward, bool wrapFlag)
</span><span class="cx"> {
</span><span class="cx"> return forward
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (205804 => 205805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2016-09-12 08:09:49 UTC (rev 205804)
+++ trunk/Source/WebCore/page/Page.h 2016-09-12 09:26:19 UTC (rev 205805)
</span><span class="lines">@@ -166,8 +166,6 @@
</span><span class="cx"> MainFrame& mainFrame() { return m_mainFrame.get(); }
</span><span class="cx"> const MainFrame& mainFrame() const { return m_mainFrame.get(); }
</span><span class="cx">
</span><del>- bool inPageCache() const;
-
</del><span class="cx"> bool openedByDOM() const;
</span><span class="cx"> void setOpenedByDOM();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>