<!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>[181247] 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/181247">181247</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-03-08 16:39:16 -0700 (Sun, 08 Mar 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Don't call RenderLayerCompositor::needsToBeComposited() so many times
https://bugs.webkit.org/show_bug.cgi?id=142441

Reviewed by Brent Fulgham.

Save one call to needsToBeComposited() per RenderLayer while rebuilding compositing
layers, and a call to isRunningAcceleratedTransformAnimation() in some cases.

computeCompositingRequirements() already knows if the layer will be composited, so
pass that to updateBacking() in the form of a &quot;yes/no/don't&quot; know enum. However,
since updateBacking() no longer calls needsToBeComposited(), we need to call
requiresCompositingForPosition() to get the viewportConstrainedNotCompositedReason flags.

isRunningAcceleratedTransformAnimation() will only be true for a layer which has a
direct compositing reason, so only call isRunningAcceleratedTransformAnimation()
in that case.

* rendering/RenderLayerCompositor.cpp:
(WebCore::rendererForCompositingTests):
(WebCore::RenderLayerCompositor::updateBacking):
(WebCore::RenderLayerCompositor::computeCompositingRequirements):
(WebCore::RenderLayerCompositor::requiresCompositingLayer): Use references.
(WebCore::RenderLayerCompositor::reasonsForCompositing): Use references.
* rendering/RenderLayerCompositor.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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 (181246 => 181247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-03-08 21:32:50 UTC (rev 181246)
+++ trunk/Source/WebCore/ChangeLog        2015-03-08 23:39:16 UTC (rev 181247)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-03-08  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Don't call RenderLayerCompositor::needsToBeComposited() so many times
+        https://bugs.webkit.org/show_bug.cgi?id=142441
+
+        Reviewed by Brent Fulgham.
+
+        Save one call to needsToBeComposited() per RenderLayer while rebuilding compositing
+        layers, and a call to isRunningAcceleratedTransformAnimation() in some cases.
+        
+        computeCompositingRequirements() already knows if the layer will be composited, so
+        pass that to updateBacking() in the form of a &quot;yes/no/don't&quot; know enum. However,
+        since updateBacking() no longer calls needsToBeComposited(), we need to call 
+        requiresCompositingForPosition() to get the viewportConstrainedNotCompositedReason flags.
+        
+        isRunningAcceleratedTransformAnimation() will only be true for a layer which has a
+        direct compositing reason, so only call isRunningAcceleratedTransformAnimation()
+        in that case.
+        
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::rendererForCompositingTests):
+        (WebCore::RenderLayerCompositor::updateBacking):
+        (WebCore::RenderLayerCompositor::computeCompositingRequirements):
+        (WebCore::RenderLayerCompositor::requiresCompositingLayer): Use references.
+        (WebCore::RenderLayerCompositor::reasonsForCompositing): Use references.
+        * rendering/RenderLayerCompositor.h:
+
+2015-03-08  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
</ins><span class="cx">         In RenderLayerCompositor, track layer bounds and the haveComputedBounds flag together in a struct
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=142449
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (181246 => 181247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2015-03-08 21:32:50 UTC (rev 181246)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2015-03-08 23:39:16 UTC (rev 181247)
</span><span class="lines">@@ -943,12 +943,30 @@
</span><span class="cx">     return (clipPath.type() != ClipPathOperation::Shape || clipPath.type() == ClipPathOperation::Shape) &amp;&amp; GraphicsLayer::supportsLayerType(GraphicsLayer::Type::Shape);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool RenderLayerCompositor::updateBacking(RenderLayer&amp; layer, CompositingChangeRepaint shouldRepaint)
</del><ins>+static RenderLayerModelObject&amp; rendererForCompositingTests(const RenderLayer&amp; layer)
</ins><span class="cx"> {
</span><ins>+    RenderLayerModelObject* renderer = &amp;layer.renderer();
+
+    // The compositing state of a reflection should match that of its reflected layer.
+    if (layer.isReflection())
+        renderer = downcast&lt;RenderLayerModelObject&gt;(renderer-&gt;parent()); // The RenderReplica's parent is the object being reflected.
+
+    return *renderer;
+}
+
+bool RenderLayerCompositor::updateBacking(RenderLayer&amp; layer, CompositingChangeRepaint shouldRepaint, BackingRequired backingRequired)
+{
</ins><span class="cx">     bool layerChanged = false;
</span><span class="cx">     RenderLayer::ViewportConstrainedNotCompositedReason viewportConstrainedNotCompositedReason = RenderLayer::NoNotCompositedReason;
</span><span class="cx"> 
</span><del>-    if (needsToBeComposited(layer, &amp;viewportConstrainedNotCompositedReason)) {
</del><ins>+    if (backingRequired == BackingRequired::Unknown)
+        backingRequired = needsToBeComposited(layer, &amp;viewportConstrainedNotCompositedReason) ? BackingRequired::Yes : BackingRequired::No;
+    else {
+        // Need to fetch viewportConstrainedNotCompositedReason, but without doing all the work that needsToBeComposited does.
+        requiresCompositingForPosition(rendererForCompositingTests(layer), layer, &amp;viewportConstrainedNotCompositedReason);
+    }
+
+    if (backingRequired == BackingRequired::Yes) {
</ins><span class="cx">         enableCompositingMode();
</span><span class="cx">         
</span><span class="cx">         if (!layer.backing()) {
</span><span class="lines">@@ -1243,10 +1261,11 @@
</span><span class="cx">     layer.setHasCompositingDescendant(false);
</span><span class="cx">     layer.setIndirectCompositingReason(RenderLayer::IndirectCompositingReason::None);
</span><span class="cx"> 
</span><del>-    // Check if the layer needs to be composited for non-indirect reasons (ex. 3D transform).
-    // We use this value to avoid checking the overlap-map, if we know for sure the layer
</del><ins>+    // Check if the layer needs to be composited for direct reasons (e.g. 3D transform).
+    // We use this value to avoid checking the overlap map, if we know for sure the layer
</ins><span class="cx">     // is already going to be composited for other reasons.
</span><span class="cx">     bool willBeComposited = needsToBeComposited(layer);
</span><ins>+    bool mayHaveAnimatedTransform = willBeComposited &amp;&amp; !layer.isRootLayer();
</ins><span class="cx"> 
</span><span class="cx">     RenderLayer::IndirectCompositingReason compositingReason = compositingState.subtreeIsCompositing ? RenderLayer::IndirectCompositingReason::Stacking : RenderLayer::IndirectCompositingReason::None;
</span><span class="cx"> 
</span><span class="lines">@@ -1396,7 +1415,7 @@
</span><span class="cx">     // Turn overlap testing off for later layers if it's already off, or if we have an animating transform.
</span><span class="cx">     // Note that if the layer clips its descendants, there's no reason to propagate the child animation to the parent layers. That's because
</span><span class="cx">     // we know for sure the animation is contained inside the clipping rectangle, which is already added to the overlap map.
</span><del>-    if ((!childState.testingOverlap &amp;&amp; !isCompositedClippingLayer) || isRunningAcceleratedTransformAnimation(layer.renderer()))
</del><ins>+    if ((!childState.testingOverlap &amp;&amp; !isCompositedClippingLayer) || (mayHaveAnimatedTransform &amp;&amp; isRunningAcceleratedTransformAnimation(layer.renderer())))
</ins><span class="cx">         compositingState.testingOverlap = false;
</span><span class="cx">     
</span><span class="cx">     if (isCompositedClippingLayer) {
</span><span class="lines">@@ -1434,7 +1453,7 @@
</span><span class="cx">         repaintOnCompositingChange(layer);
</span><span class="cx"> 
</span><span class="cx">     // Update backing now, so that we can use isComposited() reliably during tree traversal in rebuildCompositingLayerTree().
</span><del>-    if (updateBacking(layer, CompositingChangeRepaintNow))
</del><ins>+    if (updateBacking(layer, CompositingChangeRepaintNow, willBeComposited ? BackingRequired::Yes : BackingRequired::No))
</ins><span class="cx">         layersChanged = true;
</span><span class="cx"> 
</span><span class="cx">     if (layer.reflectionLayer() &amp;&amp; updateLayerCompositingState(*layer.reflectionLayer(), CompositingChangeRepaintNow))
</span><span class="lines">@@ -2136,27 +2155,23 @@
</span><span class="cx"> // static
</span><span class="cx"> bool RenderLayerCompositor::requiresCompositingLayer(const RenderLayer&amp; layer, RenderLayer::ViewportConstrainedNotCompositedReason* viewportConstrainedNotCompositedReason) const
</span><span class="cx"> {
</span><del>-    auto* renderer = &amp;layer.renderer();
</del><ins>+    auto&amp; renderer = rendererForCompositingTests(layer);
</ins><span class="cx"> 
</span><del>-    // The compositing state of a reflection should match that of its reflected layer.
-    if (layer.isReflection())
-        renderer = downcast&lt;RenderLayerModelObject&gt;(renderer-&gt;parent()); // The RenderReplica's parent is the object being reflected.
-
</del><span class="cx">     // The root layer always has a compositing layer, but it may not have backing.
</span><del>-    return requiresCompositingForTransform(*renderer)
-        || requiresCompositingForVideo(*renderer)
-        || requiresCompositingForCanvas(*renderer)
-        || requiresCompositingForPlugin(*renderer)
-        || requiresCompositingForFrame(*renderer)
-        || requiresCompositingForBackfaceVisibility(*renderer)
-        || clipsCompositingDescendants(*renderer-&gt;layer())
-        || requiresCompositingForAnimation(*renderer)
-        || requiresCompositingForFilters(*renderer)
-        || requiresCompositingForPosition(*renderer, *renderer-&gt;layer(), viewportConstrainedNotCompositedReason)
</del><ins>+    return requiresCompositingForTransform(renderer)
+        || requiresCompositingForVideo(renderer)
+        || requiresCompositingForCanvas(renderer)
+        || requiresCompositingForPlugin(renderer)
+        || requiresCompositingForFrame(renderer)
+        || requiresCompositingForBackfaceVisibility(renderer)
+        || clipsCompositingDescendants(*renderer.layer())
+        || requiresCompositingForAnimation(renderer)
+        || requiresCompositingForFilters(renderer)
+        || requiresCompositingForPosition(renderer, *renderer.layer(), viewportConstrainedNotCompositedReason)
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>-        || requiresCompositingForScrolling(*renderer-&gt;layer())
</del><ins>+        || requiresCompositingForScrolling(*renderer.layer())
</ins><span class="cx"> #endif
</span><del>-        || requiresCompositingForOverflowScrolling(*renderer-&gt;layer());
</del><ins>+        || requiresCompositingForOverflowScrolling(*renderer.layer());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool RenderLayerCompositor::canBeComposited(const RenderLayer&amp; layer) const
</span><span class="lines">@@ -2229,46 +2244,44 @@
</span><span class="cx">     if (!layer.isComposited())
</span><span class="cx">         return reasons;
</span><span class="cx"> 
</span><del>-    auto* renderer = &amp;layer.renderer();
-    if (layer.isReflection())
-        renderer = downcast&lt;RenderLayerModelObject&gt;(renderer-&gt;parent());
</del><ins>+    auto&amp; renderer = rendererForCompositingTests(layer);
</ins><span class="cx"> 
</span><del>-    if (requiresCompositingForTransform(*renderer))
</del><ins>+    if (requiresCompositingForTransform(renderer))
</ins><span class="cx">         reasons |= CompositingReason3DTransform;
</span><span class="cx"> 
</span><del>-    if (requiresCompositingForVideo(*renderer))
</del><ins>+    if (requiresCompositingForVideo(renderer))
</ins><span class="cx">         reasons |= CompositingReasonVideo;
</span><del>-    else if (requiresCompositingForCanvas(*renderer))
</del><ins>+    else if (requiresCompositingForCanvas(renderer))
</ins><span class="cx">         reasons |= CompositingReasonCanvas;
</span><del>-    else if (requiresCompositingForPlugin(*renderer))
</del><ins>+    else if (requiresCompositingForPlugin(renderer))
</ins><span class="cx">         reasons |= CompositingReasonPlugin;
</span><del>-    else if (requiresCompositingForFrame(*renderer))
</del><ins>+    else if (requiresCompositingForFrame(renderer))
</ins><span class="cx">         reasons |= CompositingReasonIFrame;
</span><span class="cx">     
</span><del>-    if ((canRender3DTransforms() &amp;&amp; renderer-&gt;style().backfaceVisibility() == BackfaceVisibilityHidden))
</del><ins>+    if ((canRender3DTransforms() &amp;&amp; renderer.style().backfaceVisibility() == BackfaceVisibilityHidden))
</ins><span class="cx">         reasons |= CompositingReasonBackfaceVisibilityHidden;
</span><span class="cx"> 
</span><del>-    if (clipsCompositingDescendants(*renderer-&gt;layer()))
</del><ins>+    if (clipsCompositingDescendants(*renderer.layer()))
</ins><span class="cx">         reasons |= CompositingReasonClipsCompositingDescendants;
</span><span class="cx"> 
</span><del>-    if (requiresCompositingForAnimation(*renderer))
</del><ins>+    if (requiresCompositingForAnimation(renderer))
</ins><span class="cx">         reasons |= CompositingReasonAnimation;
</span><span class="cx"> 
</span><del>-    if (requiresCompositingForFilters(*renderer))
</del><ins>+    if (requiresCompositingForFilters(renderer))
</ins><span class="cx">         reasons |= CompositingReasonFilters;
</span><span class="cx"> 
</span><del>-    if (requiresCompositingForPosition(*renderer, *renderer-&gt;layer()))
-        reasons |= renderer-&gt;style().position() == FixedPosition ? CompositingReasonPositionFixed : CompositingReasonPositionSticky;
</del><ins>+    if (requiresCompositingForPosition(renderer, *renderer.layer()))
+        reasons |= renderer.style().position() == FixedPosition ? CompositingReasonPositionFixed : CompositingReasonPositionSticky;
</ins><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-    if (requiresCompositingForScrolling(*renderer-&gt;layer()))
</del><ins>+    if (requiresCompositingForScrolling(*renderer.layer()))
</ins><span class="cx">         reasons |= CompositingReasonOverflowScrollingTouch;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    if (requiresCompositingForOverflowScrolling(*renderer-&gt;layer()))
</del><ins>+    if (requiresCompositingForOverflowScrolling(*renderer.layer()))
</ins><span class="cx">         reasons |= CompositingReasonOverflowScrollingTouch;
</span><span class="cx"> 
</span><del>-    switch (renderer-&gt;layer()-&gt;indirectCompositingReason()) {
</del><ins>+    switch (renderer.layer()-&gt;indirectCompositingReason()) {
</ins><span class="cx">     case RenderLayer::IndirectCompositingReason::None:
</span><span class="cx">         break;
</span><span class="cx">     case RenderLayer::IndirectCompositingReason::Stacking:
</span><span class="lines">@@ -2281,19 +2294,19 @@
</span><span class="cx">         reasons |= CompositingReasonNegativeZIndexChildren;
</span><span class="cx">         break;
</span><span class="cx">     case RenderLayer::IndirectCompositingReason::GraphicalEffect:
</span><del>-        if (renderer-&gt;hasTransform())
</del><ins>+        if (renderer.hasTransform())
</ins><span class="cx">             reasons |= CompositingReasonTransformWithCompositedDescendants;
</span><span class="cx"> 
</span><del>-        if (renderer-&gt;isTransparent())
</del><ins>+        if (renderer.isTransparent())
</ins><span class="cx">             reasons |= CompositingReasonOpacityWithCompositedDescendants;
</span><span class="cx"> 
</span><del>-        if (renderer-&gt;hasMask())
</del><ins>+        if (renderer.hasMask())
</ins><span class="cx">             reasons |= CompositingReasonMaskWithCompositedDescendants;
</span><span class="cx"> 
</span><del>-        if (renderer-&gt;hasReflection())
</del><ins>+        if (renderer.hasReflection())
</ins><span class="cx">             reasons |= CompositingReasonReflectionWithCompositedDescendants;
</span><span class="cx"> 
</span><del>-        if (renderer-&gt;hasFilter() || renderer-&gt;hasBackdropFilter())
</del><ins>+        if (renderer.hasFilter() || renderer.hasBackdropFilter())
</ins><span class="cx">             reasons |= CompositingReasonFilterWithCompositedDescendants;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="lines">@@ -2312,7 +2325,7 @@
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (inCompositingMode() &amp;&amp; renderer-&gt;layer()-&gt;isRootLayer())
</del><ins>+    if (inCompositingMode() &amp;&amp; renderer.layer()-&gt;isRootLayer())
</ins><span class="cx">         reasons |= CompositingReasonRoot;
</span><span class="cx"> 
</span><span class="cx">     return reasons;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (181246 => 181247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h        2015-03-08 21:32:50 UTC (rev 181246)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h        2015-03-08 23:39:16 UTC (rev 181247)
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx"> 
</span><span class="cx">     void setShouldReevaluateCompositingAfterLayout() { m_reevaluateCompositingAfterLayout = true; }
</span><span class="cx"> 
</span><del>-    bool viewHasTransparentBackground(Color* backgroundColor = 0) const;
</del><ins>+    bool viewHasTransparentBackground(Color* backgroundColor = nullptr) const;
</ins><span class="cx"> 
</span><span class="cx">     bool hasNonMainLayersWithTiledBacking() const { return m_layersWithTiledBackingCount; }
</span><span class="cx"> 
</span><span class="lines">@@ -322,14 +322,15 @@
</span><span class="cx">     virtual void flushLayersSoon(GraphicsLayerUpdater*) override;
</span><span class="cx"> 
</span><span class="cx">     // Whether the given RL needs a compositing layer.
</span><del>-    bool needsToBeComposited(const RenderLayer&amp;, RenderLayer::ViewportConstrainedNotCompositedReason* = 0) const;
</del><ins>+    bool needsToBeComposited(const RenderLayer&amp;, RenderLayer::ViewportConstrainedNotCompositedReason* = nullptr) const;
</ins><span class="cx">     // Whether the layer has an intrinsic need for compositing layer.
</span><del>-    bool requiresCompositingLayer(const RenderLayer&amp;, RenderLayer::ViewportConstrainedNotCompositedReason* = 0) const;
</del><ins>+    bool requiresCompositingLayer(const RenderLayer&amp;, RenderLayer::ViewportConstrainedNotCompositedReason* = nullptr) const;
</ins><span class="cx">     // Whether the layer could ever be composited.
</span><span class="cx">     bool canBeComposited(const RenderLayer&amp;) const;
</span><span class="cx"> 
</span><span class="cx">     // Make or destroy the backing for this layer; returns true if backing changed.
</span><del>-    bool updateBacking(RenderLayer&amp;, CompositingChangeRepaint shouldRepaint);
</del><ins>+    enum class BackingRequired { No, Yes, Unknown };
+    bool updateBacking(RenderLayer&amp;, CompositingChangeRepaint shouldRepaint, BackingRequired = BackingRequired::Unknown);
</ins><span class="cx"> 
</span><span class="cx">     void clearBackingForLayerIncludingDescendants(RenderLayer&amp;);
</span><span class="cx">     void setIsInWindowForLayerIncludingDescendants(RenderLayer&amp;, bool isInWindow);
</span><span class="lines">@@ -410,7 +411,7 @@
</span><span class="cx">     bool requiresCompositingForFrame(RenderLayerModelObject&amp;) const;
</span><span class="cx">     bool requiresCompositingForFilters(RenderLayerModelObject&amp;) const;
</span><span class="cx">     bool requiresCompositingForScrollableFrame() const;
</span><del>-    bool requiresCompositingForPosition(RenderLayerModelObject&amp;, const RenderLayer&amp;, RenderLayer::ViewportConstrainedNotCompositedReason* = 0) const;
</del><ins>+    bool requiresCompositingForPosition(RenderLayerModelObject&amp;, const RenderLayer&amp;, RenderLayer::ViewportConstrainedNotCompositedReason* = nullptr) const;
</ins><span class="cx">     bool requiresCompositingForOverflowScrolling(const RenderLayer&amp;) const;
</span><span class="cx">     bool requiresCompositingForIndirectReason(RenderLayerModelObject&amp;, bool hasCompositedDescendants, bool has3DTransformedDescendants, RenderLayer::IndirectCompositingReason&amp;) const;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>