<!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>[210206] 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/210206">210206</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2016-12-30 00:54:25 -0800 (Fri, 30 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop the render tree for documents in the page cache.
<https://webkit.org/b/121798>
Reviewed by Darin Adler.
To save memory and reduce complexity, have documents tear down their render tree
when entering the page cache. I've wanted to do this for a long time and it seems
like we can actually do it now.
This patch will enable a number of clean-ups since it's no longer valid for renderers
to exist while the document is in page cache.
* dom/Document.cpp:
(WebCore::Document::destroyRenderTree): Remove assertion that we're not in the page cache
since we will now be tearing down render trees right as they enter the page cache.
(WebCore::Document::setPageCacheState): Tear down the render tree right before setting
the in-cache flag. From now on, there should not exist render objects for documents in
the page cache.
* history/CachedFrame.cpp:
(WebCore::CachedFrameBase::restore):
* page/FrameView.h:
* page/FrameView.cpp:
(WebCore::FrameView::didRestoreFromPageCache): Update the scollable area set after restoring a
frame from the page cache. This dirties the scrolling tree, which was covered by tests.
* page/animation/AnimationBase.cpp:
(WebCore::AnimationBase::setNeedsStyleRecalc): Make this a no-op if the render tree is being
torn down. This fixes assertions firing on animation tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryCachedFramecpp">trunk/Source/WebCore/history/CachedFrame.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationBasecpp">trunk/Source/WebCore/page/animation/AnimationBase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210205 => 210206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-29 18:46:31 UTC (rev 210205)
+++ trunk/Source/WebCore/ChangeLog 2016-12-30 08:54:25 UTC (rev 210206)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-12-30 Andreas Kling <akling@apple.com>
+
+ Drop the render tree for documents in the page cache.
+ <https://webkit.org/b/121798>
+
+ Reviewed by Darin Adler.
+
+ To save memory and reduce complexity, have documents tear down their render tree
+ when entering the page cache. I've wanted to do this for a long time and it seems
+ like we can actually do it now.
+
+ This patch will enable a number of clean-ups since it's no longer valid for renderers
+ to exist while the document is in page cache.
+
+ * dom/Document.cpp:
+ (WebCore::Document::destroyRenderTree): Remove assertion that we're not in the page cache
+ since we will now be tearing down render trees right as they enter the page cache.
+
+ (WebCore::Document::setPageCacheState): Tear down the render tree right before setting
+ the in-cache flag. From now on, there should not exist render objects for documents in
+ the page cache.
+
+ * history/CachedFrame.cpp:
+ (WebCore::CachedFrameBase::restore):
+ * page/FrameView.h:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::didRestoreFromPageCache): Update the scollable area set after restoring a
+ frame from the page cache. This dirties the scrolling tree, which was covered by tests.
+
+ * page/animation/AnimationBase.cpp:
+ (WebCore::AnimationBase::setNeedsStyleRecalc): Make this a no-op if the render tree is being
+ torn down. This fixes assertions firing on animation tests.
+
</ins><span class="cx"> 2016-12-29 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Need to expose frames to iOS Accessibility
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (210205 => 210206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-12-29 18:46:31 UTC (rev 210205)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-12-30 08:54:25 UTC (rev 210206)
</span><span class="lines">@@ -2221,7 +2221,6 @@
</span><span class="cx"> void Document::destroyRenderTree()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(hasLivingRenderTree());
</span><del>- ASSERT(m_pageCacheState != InPageCache);
</del><span class="cx">
</span><span class="cx"> SetForScope<bool> change(m_renderTreeBeingDestroyed, true);
</span><span class="cx">
</span><span class="lines">@@ -4524,6 +4523,13 @@
</span><span class="cx"> if (m_pageCacheState == state)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (state == InPageCache) {
+ // When entering page cache, tear down the render tree before setting the in-cache flag.
+ // This maintains the invariant that render trees are never present in the page cache.
+ if (hasLivingRenderTree())
+ destroyRenderTree();
+ }
+
</ins><span class="cx"> m_pageCacheState = state;
</span><span class="cx">
</span><span class="cx"> FrameView* v = view();
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryCachedFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/CachedFrame.cpp (210205 => 210206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/CachedFrame.cpp 2016-12-29 18:46:31 UTC (rev 210205)
+++ trunk/Source/WebCore/history/CachedFrame.cpp 2016-12-30 08:54:25 UTC (rev 210206)
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx"> m_document->page()->chrome().client().needTouchEvents(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ frame.view()->didRestoreFromPageCache();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CachedFrame::CachedFrame(Frame& frame)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (210205 => 210206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2016-12-29 18:46:31 UTC (rev 210205)
+++ trunk/Source/WebCore/page/FrameView.cpp 2016-12-30 08:54:25 UTC (rev 210206)
</span><span class="lines">@@ -636,6 +636,13 @@
</span><span class="cx"> return ScrollView::createScrollbar(orientation);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void FrameView::didRestoreFromPageCache()
+{
+ // When restoring from page cache, the main frame stays in place while subframes get swapped in.
+ // We update the scrollable area set to ensure that scrolling data structures get invalidated.
+ updateScrollableAreaSet();
+}
+
</ins><span class="cx"> void FrameView::setContentsSize(const IntSize& size)
</span><span class="cx"> {
</span><span class="cx"> if (size == contentsSize())
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (210205 => 210206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2016-12-29 18:46:31 UTC (rev 210205)
+++ trunk/Source/WebCore/page/FrameView.h 2016-12-30 08:54:25 UTC (rev 210206)
</span><span class="lines">@@ -587,6 +587,8 @@
</span><span class="cx">
</span><span class="cx"> bool shouldPlaceBlockDirectionScrollbarOnLeft() const final;
</span><span class="cx">
</span><ins>+ void didRestoreFromPageCache();
+
</ins><span class="cx"> protected:
</span><span class="cx"> bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect) override;
</span><span class="cx"> void scrollContentsSlowPath(const IntRect& updateRect) override;
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationBase.cpp (210205 => 210206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationBase.cpp 2016-12-29 18:46:31 UTC (rev 210205)
+++ trunk/Source/WebCore/page/animation/AnimationBase.cpp 2016-12-30 08:54:25 UTC (rev 210206)
</span><span class="lines">@@ -89,9 +89,11 @@
</span><span class="cx">
</span><span class="cx"> void AnimationBase::setNeedsStyleRecalc(Element* element)
</span><span class="cx"> {
</span><del>- ASSERT(!element || element->document().pageCacheState() == Document::NotInPageCache);
- if (element)
- element->invalidateStyleAndLayerComposition();
</del><ins>+ if (!element || element->document().renderTreeBeingDestroyed())
+ return;
+
+ ASSERT(element->document().pageCacheState() == Document::NotInPageCache);
+ element->invalidateStyleAndLayerComposition();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double AnimationBase::duration() const
</span></span></pre>
</div>
</div>
</body>
</html>