<!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>[185118] 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/185118">185118</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-06-02 13:20:41 -0700 (Tue, 02 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Calling FrameView::viewportContentsChanged() after style recalcs is too expensive
https://bugs.webkit.org/show_bug.cgi?id=145554
<rdar://problem/21189478>
Reviewed by Darin Adler and Simon Fraser.
Only call FrameView::viewportContentsChanged() after a style recalc if
composited layers have been updated (and there is no pending layout).
We already viewportContentsChanged() after layout so we only need to
call viewportContentsChanged() after a style recalc if it did not cause
a layout but may have caused an element to become visible. In
particular, this can happen in the case of composited animations (e.g.
using -webkit-transform to move an element inside the viewport).
Therefore, we now only call viewportContentsChanged() after a style
recalc if it caused composited layers to be updated. This avoids a lot
of unnecessary calls to viewportContentsChanged(), which is expensive.
No new tests, already covered by:
fast/images/animated-gif-webkit-transform.html
* dom/Document.cpp:
(WebCore::Document::recalcStyle):
* page/FrameView.cpp:
(WebCore::FrameView::updateCompositingLayersAfterStyleChange):
* page/FrameView.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::didRecalcStyleWithNoPendingLayout):
(WebCore::RenderLayerCompositor::updateCompositingLayers):
* rendering/RenderLayerCompositor.h:</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="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorh">trunk/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185117 => 185118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-02 20:19:08 UTC (rev 185117)
+++ trunk/Source/WebCore/ChangeLog 2015-06-02 20:20:41 UTC (rev 185118)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-06-02 Chris Dumez <cdumez@apple.com>
+
+ Calling FrameView::viewportContentsChanged() after style recalcs is too expensive
+ https://bugs.webkit.org/show_bug.cgi?id=145554
+ <rdar://problem/21189478>
+
+ Reviewed by Darin Adler and Simon Fraser.
+
+ Only call FrameView::viewportContentsChanged() after a style recalc if
+ composited layers have been updated (and there is no pending layout).
+
+ We already viewportContentsChanged() after layout so we only need to
+ call viewportContentsChanged() after a style recalc if it did not cause
+ a layout but may have caused an element to become visible. In
+ particular, this can happen in the case of composited animations (e.g.
+ using -webkit-transform to move an element inside the viewport).
+ Therefore, we now only call viewportContentsChanged() after a style
+ recalc if it caused composited layers to be updated. This avoids a lot
+ of unnecessary calls to viewportContentsChanged(), which is expensive.
+
+ No new tests, already covered by:
+ fast/images/animated-gif-webkit-transform.html
+
+ * dom/Document.cpp:
+ (WebCore::Document::recalcStyle):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::updateCompositingLayersAfterStyleChange):
+ * page/FrameView.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::didRecalcStyleWithNoPendingLayout):
+ (WebCore::RenderLayerCompositor::updateCompositingLayers):
+ * rendering/RenderLayerCompositor.h:
+
</ins><span class="cx"> 2015-06-02 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove use of CTFontSetRenderingParameters()
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (185117 => 185118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-06-02 20:19:08 UTC (rev 185117)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-06-02 20:20:41 UTC (rev 185118)
</span><span class="lines">@@ -1767,6 +1767,7 @@
</span><span class="cx"> // i.e. updating the flag here would be too late.
</span><span class="cx">
</span><span class="cx"> m_inStyleRecalc = true;
</span><ins>+ bool updatedCompositingLayers = false;
</ins><span class="cx"> {
</span><span class="cx"> Style::PostResolutionCallbackDisabler disabler(*this);
</span><span class="cx"> WidgetHierarchyUpdatesSuspensionScope suspendWidgetHierarchyUpdates;
</span><span class="lines">@@ -1781,7 +1782,7 @@
</span><span class="cx">
</span><span class="cx"> Style::resolveTree(*this, change);
</span><span class="cx">
</span><del>- frameView.updateCompositingLayersAfterStyleChange();
</del><ins>+ updatedCompositingLayers = frameView.updateCompositingLayersAfterStyleChange();
</ins><span class="cx">
</span><span class="cx"> clearNeedsStyleRecalc();
</span><span class="cx"> clearChildNeedsStyleRecalc();
</span><span class="lines">@@ -1807,7 +1808,7 @@
</span><span class="cx"> // Some animated images may now be inside the viewport due to style recalc,
</span><span class="cx"> // resume them if necessary if there is no layout pending. Otherwise, we'll
</span><span class="cx"> // check if they need to be resumed after layout.
</span><del>- if (!frameView.needsLayout())
</del><ins>+ if (updatedCompositingLayers && !frameView.needsLayout())
</ins><span class="cx"> frameView.viewportContentsChanged();
</span><span class="cx">
</span><span class="cx"> // As a result of the style recalculation, the currently hovered element might have been
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (185117 => 185118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-06-02 20:19:08 UTC (rev 185117)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-06-02 20:20:41 UTC (rev 185118)
</span><span class="lines">@@ -758,17 +758,17 @@
</span><span class="cx"> renderView->compositor().willRecalcStyle();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::updateCompositingLayersAfterStyleChange()
</del><ins>+bool FrameView::updateCompositingLayersAfterStyleChange()
</ins><span class="cx"> {
</span><span class="cx"> RenderView* renderView = this->renderView();
</span><span class="cx"> if (!renderView)
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> // If we expect to update compositing after an incipient layout, don't do so here.
</span><span class="cx"> if (inPreLayoutStyleUpdate() || layoutPending() || renderView->needsLayout())
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx">
</span><del>- renderView->compositor().didRecalcStyleWithNoPendingLayout();
</del><ins>+ return renderView->compositor().didRecalcStyleWithNoPendingLayout();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameView::updateCompositingLayersAfterLayout()
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (185117 => 185118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2015-06-02 20:19:08 UTC (rev 185117)
+++ trunk/Source/WebCore/page/FrameView.h 2015-06-02 20:20:41 UTC (rev 185118)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void willRecalcStyle();
</span><del>- void updateCompositingLayersAfterStyleChange();
</del><ins>+ bool updateCompositingLayersAfterStyleChange();
</ins><span class="cx"> void updateCompositingLayersAfterLayout();
</span><span class="cx"> bool flushCompositingStateForThisFrame(Frame* rootFrameForFlush);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (185117 => 185118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-06-02 20:19:08 UTC (rev 185117)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-06-02 20:20:41 UTC (rev 185118)
</span><span class="lines">@@ -384,13 +384,13 @@
</span><span class="cx"> m_layerNeedsCompositingUpdate = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerCompositor::didRecalcStyleWithNoPendingLayout()
</del><ins>+bool RenderLayerCompositor::didRecalcStyleWithNoPendingLayout()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_layerNeedsCompositingUpdate)
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> cacheAcceleratedCompositingFlags();
</span><del>- updateCompositingLayers(CompositingUpdateAfterStyleChange);
</del><ins>+ return updateCompositingLayers(CompositingUpdateAfterStyleChange);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::customPositionForVisibleRectComputation(const GraphicsLayer* graphicsLayer, FloatPoint& position) const
</span><span class="lines">@@ -663,7 +663,7 @@
</span><span class="cx"> m_updateCompositingLayersTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerCompositor::updateCompositingLayers(CompositingUpdateType updateType, RenderLayer* updateRoot)
</del><ins>+bool RenderLayerCompositor::updateCompositingLayers(CompositingUpdateType updateType, RenderLayer* updateRoot)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Compositing, "RenderLayerCompositor %p updateCompositingLayers %d %p", this, updateType, updateRoot);
</span><span class="cx">
</span><span class="lines">@@ -673,17 +673,17 @@
</span><span class="cx">
</span><span class="cx"> // Compositing layers will be updated in Document::setVisualUpdatesAllowed(bool) if suppressed here.
</span><span class="cx"> if (!m_renderView.document().visualUpdatesAllowed())
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> // Avoid updating the layers with old values. Compositing layers will be updated after the layout is finished.
</span><span class="cx"> if (m_renderView.needsLayout())
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> if ((m_forceCompositingMode || m_renderView.frame().mainFrame().pageOverlayController().overlayCount()) && !m_compositing)
</span><span class="cx"> enableCompositingMode(true);
</span><span class="cx">
</span><span class="cx"> if (!m_reevaluateCompositingAfterLayout && !m_compositing)
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> ++m_compositingUpdateCount;
</span><span class="cx">
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!checkForHierarchyUpdate && !needGeometryUpdate)
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> bool needHierarchyUpdate = m_compositingLayersNeedRebuild;
</span><span class="cx"> bool isFullUpdate = !updateRoot;
</span><span class="lines">@@ -800,6 +800,8 @@
</span><span class="cx">
</span><span class="cx"> // Inform the inspector that the layer tree has changed.
</span><span class="cx"> InspectorInstrumentation::layerTreeDidChange(page());
</span><ins>+
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::appendDocumentOverlayLayers(Vector<GraphicsLayer*>& childList)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (185117 => 185118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2015-06-02 20:19:08 UTC (rev 185117)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2015-06-02 20:20:41 UTC (rev 185118)
</span><span class="lines">@@ -121,8 +121,10 @@
</span><span class="cx"> bool compositingLayersNeedRebuild() const { return m_compositingLayersNeedRebuild; }
</span><span class="cx">
</span><span class="cx"> void willRecalcStyle();
</span><del>- void didRecalcStyleWithNoPendingLayout();
</del><span class="cx">
</span><ins>+ // Returns true if the composited layers were actually updated.
+ bool didRecalcStyleWithNoPendingLayout();
+
</ins><span class="cx"> // GraphicsLayers buffer state, which gets pushed to the underlying platform layers
</span><span class="cx"> // at specific times.
</span><span class="cx"> void scheduleLayerFlush(bool canThrottle);
</span><span class="lines">@@ -139,7 +141,7 @@
</span><span class="cx"> void didChangeVisibleRect();
</span><span class="cx">
</span><span class="cx"> // Rebuild the tree of compositing layers
</span><del>- void updateCompositingLayers(CompositingUpdateType, RenderLayer* updateRoot = nullptr);
</del><ins>+ bool updateCompositingLayers(CompositingUpdateType, RenderLayer* updateRoot = nullptr);
</ins><span class="cx"> // This is only used when state changes and we do not exepect a style update or layout to happen soon (e.g. when
</span><span class="cx"> // we discover that an iframe is overlapped during painting).
</span><span class="cx"> void scheduleCompositingLayerUpdate();
</span></span></pre>
</div>
</div>
</body>
</html>