<!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>[173336] trunk</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/173336">173336</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-09-05 15:11:16 -0700 (Fri, 05 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow pages with unload handlers in the page cache
<rdar://problem/11084669> and https://bugs.webkit.org/show_bug.cgi?id=136535
Reviewed by Oliver Hunt.
Source/WebCore:
This will match what iOS has been doing for some time.
Updated tests for new behavior.
* history/PageCache.cpp:
(WebCore::logCanCacheFrameDecision):
(WebCore::PageCache::canCachePageContainingThisFrame):
LayoutTests:
* fast/frames/frame-crash-with-page-cache-expected.txt:
* fast/frames/resources/cached-page-1.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastframesframecrashwithpagecacheexpectedtxt">trunk/LayoutTests/fast/frames/frame-crash-with-page-cache-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastframesresourcescachedpage1html">trunk/LayoutTests/fast/frames/resources/cached-page-1.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehistoryPageCachecpp">trunk/Source/WebCore/history/PageCache.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173335 => 173336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-09-05 22:09:41 UTC (rev 173335)
+++ trunk/LayoutTests/ChangeLog 2014-09-05 22:11:16 UTC (rev 173336)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-09-05 Brady Eidson <beidson@apple.com>
+
+ Allow pages with unload handlers in the page cache
+ <rdar://problem/11084669> and https://bugs.webkit.org/show_bug.cgi?id=136535
+
+ Reviewed by Oliver Hunt.
+
+ * fast/frames/frame-crash-with-page-cache-expected.txt:
+ * fast/frames/resources/cached-page-1.html:
+
</ins><span class="cx"> 2014-09-05 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove statically used varyings from packing restrictions check.
</span></span></pre></div>
<a id="trunkLayoutTestsfastframesframecrashwithpagecacheexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/frames/frame-crash-with-page-cache-expected.txt (173335 => 173336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/frames/frame-crash-with-page-cache-expected.txt 2014-09-05 22:09:41 UTC (rev 173335)
+++ trunk/LayoutTests/fast/frames/frame-crash-with-page-cache-expected.txt 2014-09-05 22:11:16 UTC (rev 173336)
</span><span class="lines">@@ -1,9 +1,6 @@
</span><del>-main frame - has 1 onunload handler(s)
-main frame - has 1 onunload handler(s)
</del><span class="cx"> If WebKit does not assert or crash, you passed.
</span><span class="cx"> open page-1
</span><span class="cx"> page-1, about to navigate to page-2.
</span><del>-page-1 running unload handler
</del><span class="cx"> page-2, about to navigate to page-3.
</span><span class="cx"> On page-3, going back, now.
</span><span class="cx"> Back on page-2, timer is still firing.
</span></span></pre></div>
<a id="trunkLayoutTestsfastframesresourcescachedpage1html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/frames/resources/cached-page-1.html (173335 => 173336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/frames/resources/cached-page-1.html 2014-09-05 22:09:41 UTC (rev 173335)
+++ trunk/LayoutTests/fast/frames/resources/cached-page-1.html 2014-09-05 22:11:16 UTC (rev 173336)
</span><span class="lines">@@ -17,13 +17,8 @@
</span><span class="cx"> setTimeout(function() {location.href = "cached-page-2.html";}, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// This unload handler exists just to make sure this page is not added
-// to the page cache!
-function myUnload() {
- window.opener.log("page-1 running unload handler");
-}
</del><span class="cx"> </script>
</span><span class="cx"> </head>
</span><del>-<body onload="loadNext()" onunload="myUnload()">
</del><ins>+<body onpageshow="loadNext()">
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173335 => 173336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-05 22:09:41 UTC (rev 173335)
+++ trunk/Source/WebCore/ChangeLog 2014-09-05 22:11:16 UTC (rev 173336)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-09-05 Brady Eidson <beidson@apple.com>
+
+ Allow pages with unload handlers in the page cache
+ <rdar://problem/11084669> and https://bugs.webkit.org/show_bug.cgi?id=136535
+
+ Reviewed by Oliver Hunt.
+
+ This will match what iOS has been doing for some time.
+
+ Updated tests for new behavior.
+
+ * history/PageCache.cpp:
+ (WebCore::logCanCacheFrameDecision):
+ (WebCore::PageCache::canCachePageContainingThisFrame):
+
</ins><span class="cx"> 2014-09-05 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Implement ResourceResponse::platformSuggestedFilename() when USE(SOUP) is enabled.
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (173335 => 173336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2014-09-05 22:09:41 UTC (rev 173335)
+++ trunk/Source/WebCore/history/PageCache.cpp 2014-09-05 22:11:16 UTC (rev 173336)
</span><span class="lines">@@ -75,7 +75,6 @@
</span><span class="cx"> IsErrorPage,
</span><span class="cx"> HasPlugins,
</span><span class="cx"> IsHttpsAndCacheControlled,
</span><del>- HasUnloadListener,
</del><span class="cx"> HasDatabaseHandles,
</span><span class="cx"> HasSharedWorkers,
</span><span class="cx"> NoHistoryItem,
</span><span class="lines">@@ -130,15 +129,6 @@
</span><span class="cx"> PCLOG(" -Frame is HTTPS, and cache control prohibits caching or storing");
</span><span class="cx"> rejectReasons |= 1 << IsHttpsAndCacheControlled;
</span><span class="cx"> }
</span><del>- if (frame->document()->domWindow() && frame->document()->domWindow()->hasEventListeners(eventNames().unloadEvent)) {
- PCLOG(" -Frame has an unload event listener");
-#if !PLATFORM(IOS)
- rejectReasons |= 1 << HasUnloadListener;
-#else
- // iOS allows pages with unload event listeners to enter the page cache.
- PCLOG(" -BUT iOS allows these pages to be cached.");
-#endif
- }
</del><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> if (DatabaseManager::manager().hasOpenDatabases(frame->document())) {
</span><span class="cx"> PCLOG(" -Frame has open database handles");
</span><span class="lines">@@ -296,9 +286,6 @@
</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"> && (!document->url().protocolIs("https") || (!documentLoader->response().cacheControlContainsNoCache() && !documentLoader->response().cacheControlContainsNoStore()))
</span><del>-#if !PLATFORM(IOS)
- && (!document->domWindow() || !document->domWindow()->hasEventListeners(eventNames().unloadEvent))
-#endif
</del><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> && !DatabaseManager::manager().hasOpenDatabases(document)
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>