<!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>[190488] branches/safari-601-branch</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/190488">190488</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-02 06:56:25 -0700 (Fri, 02 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/187921">r187921</a>. rdar://problem/22801988</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformmacwk1TestExpectations">branches/safari-601-branch/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorehistoryPageCachecpp">branches/safari-601-branch/Source/WebCore/history/PageCache.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestshttptestsnavigationpagecacheiframenocurrenthistoryItemexpectedtxt">branches/safari-601-branch/LayoutTests/http/tests/navigation/page-cache-iframe-no-current-historyItem-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestsnavigationpagecacheiframenocurrenthistoryItemhtml">branches/safari-601-branch/LayoutTests/http/tests/navigation/page-cache-iframe-no-current-historyItem.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (190487 => 190488)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-10-02 13:56:19 UTC (rev 190487)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-10-02 13:56:25 UTC (rev 190488)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2015-10-02 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187921. rdar://problem/22801988
+
+ 2015-08-04 Chris Dumez <cdumez@apple.com>
+
+ Subframes with no current HistoryItem should not prevent page-caching
+ https://bugs.webkit.org/show_bug.cgi?id=147649
+ <rdar://problem/21614832>
+
+ Reviewed by Andreas Kling.
+
+ Add a layout test that covers page-caching of a page that contains an
+ iframe with no current HistoryItem. The sub-frame has no current
+ HistoryItem because its URL is invalid: "http://".
+
+ * http/tests/navigation/page-cache-iframe-no-current-historyItem-expected.txt: Added.
+ * http/tests/navigation/page-cache-iframe-no-current-historyItem.html: Added.
+ New test.
+
+ * platform/mac-wk1/TestExpectations:
+ Skip the new test on Mac WK1. The page is still not cacheable on Mac WK1
+ because WebFrameLoaderClient::canCachePage() returns false if the frame
+ does not contain HTML at the moment.
+
+2015-10-02 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r187593. rdar://problem/22801973
</span><span class="cx">
</span><span class="cx"> 2015-07-30 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestsnavigationpagecacheiframenocurrenthistoryItemexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/navigation/page-cache-iframe-no-current-historyItem-expected.txt (0 => 190488)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/navigation/page-cache-iframe-no-current-historyItem-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/navigation/page-cache-iframe-no-current-historyItem-expected.txt 2015-10-02 13:56:25 UTC (rev 190488)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+A frame without current history item should not prevent page caching.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+pageshow - not from cache
+pagehide - entering cache
+pageshow - from cache
+PASS Page did enter and was restored from the page cache
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestsnavigationpagecacheiframenocurrenthistoryItemhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/navigation/page-cache-iframe-no-current-historyItem.html (0 => 190488)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/navigation/page-cache-iframe-no-current-historyItem.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/navigation/page-cache-iframe-no-current-historyItem.html 2015-10-02 13:56:25 UTC (rev 190488)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="/resources/js-test-pre.js"></script>
+<script>
+description("A frame without current history item should not prevent page caching.");
+window.jsTestIsAsync = true;
+
+if (window.testRunner)
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+
+window.addEventListener("pageshow", function(event) {
+ debug("pageshow - " + (event.persisted ? "" : "not ") + "from cache");
+
+ if (event.persisted) {
+ testPassed("Page did enter and was restored from the page cache");
+ finishJSTest();
+ }
+}, false);
+
+window.addEventListener("pagehide", function(event) {
+ debug("pagehide - " + (event.persisted ? "" : "not ") + "entering cache");
+ if (!event.persisted) {
+ testFailed("Page did not enter the page cache.");
+ finishJSTest();
+ }
+}, false);
+
+window.addEventListener('load', function() {
+ setTimeout(function() {
+ // Force a back navigation back to this page.
+ window.location.href = "resources/page-cache-helper.html";
+ }, 0);
+}, false);
+
+</script>
+<iframe src="http://"></iframe>
+<script src="/resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/mac-wk1/TestExpectations (190487 => 190488)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/mac-wk1/TestExpectations 2015-10-02 13:56:19 UTC (rev 190487)
+++ branches/safari-601-branch/LayoutTests/platform/mac-wk1/TestExpectations 2015-10-02 13:56:25 UTC (rev 190488)
</span><span class="lines">@@ -79,6 +79,9 @@
</span><span class="cx"> # WK1 doesn't do pending WebGL policies
</span><span class="cx"> fast/canvas/webgl/useWhilePending.html [ Skip ]
</span><span class="cx">
</span><ins>+# Mac-WK1 only caches frames containing HTML at the moment.
+http/tests/navigation/page-cache-iframe-no-current-historyItem.html
+
</ins><span class="cx"> # Animated image throttling behaves differently on WK1.
</span><span class="cx"> fast/images/animated-gif-body-outside-viewport.html [ Skip ]
</span><span class="cx"> fast/images/animated-gif-window-resizing.html [ Skip ]
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (190487 => 190488)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-02 13:56:19 UTC (rev 190487)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-02 13:56:25 UTC (rev 190488)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-10-02 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187921. rdar://problem/22801988
+
+ 2015-08-04 Chris Dumez <cdumez@apple.com>
+
+ Subframes with no current HistoryItem should not prevent page-caching
+ https://bugs.webkit.org/show_bug.cgi?id=147649
+ <rdar://problem/21614832>
+
+ Reviewed by Andreas Kling.
+
+ Subframes with no current HistoryItem should not prevent page-caching.
+ We need one for the main frame as this is the key in the PageCache.
+ However, there is no reason to require one for subframes.
+
+ This is a common reason for page-caching failures nowadays.
+
+ Frames do no have a current HistoryItem until something has been loaded in them.
+
+ Test: http/tests/navigation/page-cache-iframe-no-current-historyItem.html
+
+ * history/PageCache.cpp:
+ (WebCore::logCanCacheFrameDecision):
+ (WebCore::PageCache::canCachePageContainingThisFrame):
+
+2015-10-02 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r187593. rdar://problem/22801973
</span><span class="cx">
</span><span class="cx"> 2015-07-30 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/history/PageCache.cpp (190487 => 190488)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/history/PageCache.cpp 2015-10-02 13:56:19 UTC (rev 190487)
+++ branches/safari-601-branch/Source/WebCore/history/PageCache.cpp 2015-10-02 13:56:25 UTC (rev 190488)
</span><span class="lines">@@ -155,8 +155,8 @@
</span><span class="cx"> logPageCacheFailureDiagnosticMessage(diagnosticLoggingClient, DiagnosticLoggingKeys::httpsNoStoreKey());
</span><span class="cx"> rejectReasons |= 1 << IsHttpsAndCacheControlled;
</span><span class="cx"> }
</span><del>- if (!frame.loader().history().currentItem()) {
- PCLOG(" -No current history item");
</del><ins>+ if (frame.isMainFrame() && !frame.loader().history().currentItem()) {
+ PCLOG(" -Main frame has no current history item");
</ins><span class="cx"> logPageCacheFailureDiagnosticMessage(diagnosticLoggingClient, DiagnosticLoggingKeys::noCurrentHistoryItemKey());
</span><span class="cx"> rejectReasons |= 1 << NoHistoryItem;
</span><span class="cx"> }
</span><span class="lines">@@ -318,7 +318,7 @@
</span><span class="cx"> && !(documentLoader->substituteData().isValid() && !documentLoader->substituteData().failingURL().isEmpty())
</span><span class="cx"> && (!frameLoader.subframeLoader().containsPlugins() || frame.page()->settings().pageCacheSupportsPlugins())
</span><span class="cx"> && !(frame.isMainFrame() && document->url().protocolIs("https") && documentLoader->response().cacheControlContainsNoStore())
</span><del>- && frameLoader.history().currentItem()
</del><ins>+ && (!frame.isMainFrame() || frameLoader.history().currentItem())
</ins><span class="cx"> && !frameLoader.quickRedirectComing()
</span><span class="cx"> && !documentLoader->isLoading()
</span><span class="cx"> && !documentLoader->isStopping()
</span></span></pre>
</div>
</div>
</body>
</html>