<!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>[189976] 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/189976">189976</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-09-18 12:31:45 -0700 (Fri, 18 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/182449">r182449</a>, Mavericks ONLY): Pages re-open empty after swiping back and scrolling on them
https://bugs.webkit.org/show_bug.cgi?id=149317
<rdar://problem/22521514>
Reviewed by Tim Horton.
Source/WebCore:
Disable on Mavericks a PageCache optimization from <a href="http://trac.webkit.org/projects/webkit/changeset/182449">r182449</a> which lets
into PageCache pages that only have certain types of pending loads
(images and XHR). This is because it has been determined via bisection
that this change is the one that introduced the bug on Mavericks.
* loader/DocumentLoader.cpp:
(WebCore::areAllLoadersPageCacheAcceptable):
LayoutTests:
Skip a couple of PageCache layout tests on Mavericks now that a PageCache
optimization has been disabled.
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189975 => 189976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-18 18:35:45 UTC (rev 189975)
+++ trunk/LayoutTests/ChangeLog 2015-09-18 19:31:45 UTC (rev 189976)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-09-18 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION (r182449, Mavericks ONLY): Pages re-open empty after swiping back and scrolling on them
+ https://bugs.webkit.org/show_bug.cgi?id=149317
+ <rdar://problem/22521514>
+
+ Reviewed by Tim Horton.
+
+ Skip a couple of PageCache layout tests on Mavericks now that a PageCache
+ optimization has been disabled.
+
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2015-09-18 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed iOS gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (189975 => 189976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2015-09-18 18:35:45 UTC (rev 189975)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-09-18 19:31:45 UTC (rev 189976)
</span><span class="lines">@@ -263,6 +263,11 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/149246 [ Mavericks ] css3/font-feature-settings-rendering-2.html
</span><span class="cx">
</span><ins>+# This feature is disabled on Mavericks.
+[ Mavericks ] http/tests/navigation/page-cache-pending-image-load.html [ Skip ]
+[ Mavericks ] http/tests/navigation/page-cache-pending-image-load-cache-partition.html [ Skip ]
+[ Mavericks ] http/tests/navigation/page-cache-xhr.html [ Skip ]
+
</ins><span class="cx"> webkit.org/b/68278 http/tests/history/back-with-fragment-change.php [ Failure ]
</span><span class="cx">
</span><span class="cx"> # Skip because this platform does not support a paging mouse wheel event
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189975 => 189976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-18 18:35:45 UTC (rev 189975)
+++ trunk/Source/WebCore/ChangeLog 2015-09-18 19:31:45 UTC (rev 189976)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-09-18 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION (r182449, Mavericks ONLY): Pages re-open empty after swiping back and scrolling on them
+ https://bugs.webkit.org/show_bug.cgi?id=149317
+ <rdar://problem/22521514>
+
+ Reviewed by Tim Horton.
+
+ Disable on Mavericks a PageCache optimization from r182449 which lets
+ into PageCache pages that only have certain types of pending loads
+ (images and XHR). This is because it has been determined via bisection
+ that this change is the one that introduced the bug on Mavericks.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::areAllLoadersPageCacheAcceptable):
+
</ins><span class="cx"> 2015-09-18 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Use tiled drawing for main background layer
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (189975 => 189976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-09-18 18:35:45 UTC (rev 189975)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-09-18 19:31:45 UTC (rev 189976)
</span><span class="lines">@@ -95,6 +95,7 @@
</span><span class="cx"> loader->setDefersLoading(defers);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> static bool areAllLoadersPageCacheAcceptable(const ResourceLoaderMap& loaders)
</span><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<ResourceLoader>> loadersCopy;
</span><span class="lines">@@ -114,6 +115,7 @@
</span><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> DocumentLoader::DocumentLoader(const ResourceRequest& req, const SubstituteData& substituteData)
</span><span class="cx"> : m_deferMainResourceDataLoad(true)
</span><span class="lines">@@ -286,8 +288,11 @@
</span><span class="cx"> // loading but there are subresource loads during cancellation. This must be done before the
</span><span class="cx"> // frame->stopLoading() call, which may evict the CachedResources, which we rely on to check
</span><span class="cx"> // the type of the resource loads.
</span><ins>+#if !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+ // Disabled on Mavericks because it seems to cause issues (rdar://problem/22521514).
</ins><span class="cx"> if (loading && m_committed && !mainResourceLoader() && !m_subresourceLoaders.isEmpty())
</span><span class="cx"> m_subresourceLoadersArePageCacheAcceptable = areAllLoadersPageCacheAcceptable(m_subresourceLoaders);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> if (m_committed) {
</span><span class="cx"> // Attempt to stop the frame if the document loader is loading, or if it is done loading but
</span></span></pre>
</div>
</div>
</body>
</html>