<!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>[210354] branches/safari-603-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/210354">210354</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-05 09:09:38 -0800 (Thu, 05 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210142">r210142</a>. rdar://problem/29109053</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCorehistoryCachedFramecpp">branches/safari-603-branch/Source/WebCore/history/CachedFrame.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorehistoryCachedFrameh">branches/safari-603-branch/Source/WebCore/history/CachedFrame.h</a></li>
<li><a href="#branchessafari603branchSourceWebCorepageFrameViewcpp">branches/safari-603-branch/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorepageFrameViewh">branches/safari-603-branch/Source/WebCore/page/FrameView.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestscompositingpagecachebackcrashexpectedtxt">branches/safari-603-branch/LayoutTests/compositing/page-cache-back-crash-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestscompositingpagecachebackcrashhtml">branches/safari-603-branch/LayoutTests/compositing/page-cache-back-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (210353 => 210354)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-05 17:09:34 UTC (rev 210353)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-05 17:09:38 UTC (rev 210354)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210142. rdar://problem/29109053
+
+ 2016-12-23 Andreas Kling <akling@apple.com>
+
+ REGRESSION(r209865): Crash when navigating back to some pages with compositing layers.
+ <https://webkit.org/b/166469>
+ <rdar://problem/29109053>
+
+ Reviewed by Darin Adler.
+
+ Add a smoke test for the crashes we were seeing. Thanks to Zalán for the reduction.
+
+ * compositing/page-cache-back-crash-expected.txt: Added.
+ * compositing/page-cache-back-crash.html: Added.
+
+2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210122. rdar://problem/29763012
</span><span class="cx">
</span><span class="cx"> 2016-12-22 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestscompositingpagecachebackcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/compositing/page-cache-back-crash-expected.txt (0 => 210354)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/compositing/page-cache-back-crash-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/compositing/page-cache-back-crash-expected.txt 2017-01-05 17:09:38 UTC (rev 210354)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+- Test passes if it doesn't crash.
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestscompositingpagecachebackcrashhtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/compositing/page-cache-back-crash.html (0 => 210354)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/compositing/page-cache-back-crash.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/compositing/page-cache-back-crash.html 2017-01-05 17:09:38 UTC (rev 210354)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<style>
+.outer { position: fixed; }
+.inner { position: absolute; }
+</style>
+<div class=outer>-<div class=inner></div></div>
+Test passes if it doesn't crash.
+<script>
+if (window.testRunner) {
+ window.testRunner.dumpAsText();
+ window.testRunner.waitUntilDone();
+ window.testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+}
+
+window.addEventListener("pageshow", function(event) {
+ if (event.persisted)
+ testRunner.notifyDone();
+}, false);
+
+window.addEventListener("load", function() {
+ setTimeout(function() {
+ // Navigate to a helper page that will immediately navigate back here after loading.
+ window.location.href = "iframes/resources/page-cache-helper.html";
+ }, 0);
+});
+</script>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210353 => 210354)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 17:09:34 UTC (rev 210353)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 17:09:38 UTC (rev 210354)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210142. rdar://problem/29109053
+
+ 2016-12-23 Andreas Kling <akling@apple.com>
+
+ REGRESSION(r209865): Crash when navigating back to some pages with compositing layers.
+ <https://webkit.org/b/166469>
+ <rdar://problem/29109053>
+
+ Reviewed by Darin Adler.
+
+ Remove the old WK1-era clear/restoreBackingStores optimization from the page cache.
+ When enabling it on non-iOS platforms, we started hitting lots of assertions,
+ and none of our memory tests showed any significant improvement anyway.
+
+ Test: compositing/page-cache-back-crash.html
+
+ * history/CachedFrame.cpp:
+ (WebCore::CachedFrameBase::CachedFrameBase):
+ (WebCore::CachedFrameBase::restore):
+ (WebCore::CachedFrame::CachedFrame):
+ * history/CachedFrame.h:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::restoreBackingStores): Deleted.
+ * page/FrameView.h:
+
+2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210122. rdar://problem/29763012
</span><span class="cx">
</span><span class="cx"> 2016-12-22 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehistoryCachedFramecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/history/CachedFrame.cpp (210353 => 210354)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/history/CachedFrame.cpp 2017-01-05 17:09:34 UTC (rev 210353)
+++ branches/safari-603-branch/Source/WebCore/history/CachedFrame.cpp 2017-01-05 17:09:38 UTC (rev 210354)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> , m_view(frame.view())
</span><span class="cx"> , m_url(frame.document()->url())
</span><span class="cx"> , m_isMainFrame(!frame.tree().parent())
</span><del>- , m_isComposited(frame.view()->hasCompositedContent())
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -97,9 +96,6 @@
</span><span class="cx"> // cached page.
</span><span class="cx"> frame.script().updatePlatformScriptObjects();
</span><span class="cx">
</span><del>- if (m_isComposited)
- frame.view()->restoreBackingStores();
-
</del><span class="cx"> frame.loader().client().didRestoreFromPageCache();
</span><span class="cx">
</span><span class="cx"> // Reconstruct the FrameTree. And open the child CachedFrames in their respective FrameLoaders.
</span><span class="lines">@@ -164,9 +160,6 @@
</span><span class="cx">
</span><span class="cx"> frame.loader().client().savePlatformDataToCachedFrame(this);
</span><span class="cx">
</span><del>- if (m_isComposited)
- frame.view()->clearBackingStores();
-
</del><span class="cx"> // documentWillSuspendForPageCache() can set up a layout timer on the FrameView, so clear timers after that.
</span><span class="cx"> frame.clearTimers();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehistoryCachedFrameh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/history/CachedFrame.h (210353 => 210354)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/history/CachedFrame.h 2017-01-05 17:09:34 UTC (rev 210353)
+++ branches/safari-603-branch/Source/WebCore/history/CachedFrame.h 2017-01-05 17:09:38 UTC (rev 210354)
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx"> std::unique_ptr<ScriptCachedFrameData> m_cachedFrameScriptData;
</span><span class="cx"> std::unique_ptr<CachedFramePlatformData> m_cachedFramePlatformData;
</span><span class="cx"> bool m_isMainFrame;
</span><del>- bool m_isComposited;
</del><span class="cx"> std::optional<HasInsecureContent> m_hasInsecureContent;
</span><span class="cx">
</span><span class="cx"> Vector<std::unique_ptr<CachedFrame>> m_childFrames;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/FrameView.cpp (210353 => 210354)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/FrameView.cpp 2017-01-05 17:09:34 UTC (rev 210353)
+++ branches/safari-603-branch/Source/WebCore/page/FrameView.cpp 2017-01-05 17:09:38 UTC (rev 210354)
</span><span class="lines">@@ -879,17 +879,6 @@
</span><span class="cx"> compositor.clearBackingForAllLayers();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::restoreBackingStores()
-{
- RenderView* renderView = this->renderView();
- if (!renderView)
- return;
-
- RenderLayerCompositor& compositor = renderView->compositor();
- compositor.enableCompositingMode(true);
- compositor.updateCompositingLayers(CompositingUpdateAfterLayout);
-}
-
</del><span class="cx"> GraphicsLayer* FrameView::layerForScrolling() const
</span><span class="cx"> {
</span><span class="cx"> RenderView* renderView = this->renderView();
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/FrameView.h (210353 => 210354)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/FrameView.h 2017-01-05 17:09:34 UTC (rev 210353)
+++ branches/safari-603-branch/Source/WebCore/page/FrameView.h 2017-01-05 17:09:38 UTC (rev 210354)
</span><span class="lines">@@ -154,7 +154,6 @@
</span><span class="cx"> void updateCompositingLayersAfterLayout();
</span><span class="cx">
</span><span class="cx"> void clearBackingStores();
</span><del>- void restoreBackingStores();
</del><span class="cx">
</span><span class="cx"> // Called when changes to the GraphicsLayer hierarchy have to be synchronized with
</span><span class="cx"> // content rendered via the normal painting path.
</span></span></pre>
</div>
</div>
</body>
</html>