<!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>[181245] 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/181245">181245</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-03-08 10:02:16 -0700 (Sun, 08 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>In RenderLayerCompositor, track layer bounds and the haveComputedBounds flag together in a struct
https://bugs.webkit.org/show_bug.cgi?id=142449
Reviewed by Brent Fulgham.
Rather than tracking 'layerBounds' and 'haveComputedBounds' separately, group them together
in an OverlapExtent struct and add a function to compute the bounds, which removes
a copy of this code. OverlapExtent will be extended in a future patch.
No behavior change.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::OverlapMap::geometryMap): Allow const access to
the geometryMap, used by computeExtent().
(WebCore::RenderLayerCompositor::computeExtent):
(WebCore::RenderLayerCompositor::addToOverlapMap):
(WebCore::RenderLayerCompositor::addToOverlapMapRecursive):
(WebCore::RenderLayerCompositor::computeCompositingRequirements):
* 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 (181244 => 181245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-08 10:50:22 UTC (rev 181244)
+++ trunk/Source/WebCore/ChangeLog 2015-03-08 17:02:16 UTC (rev 181245)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-03-08 Simon Fraser <simon.fraser@apple.com>
+
+ In RenderLayerCompositor, track layer bounds and the haveComputedBounds flag together in a struct
+ https://bugs.webkit.org/show_bug.cgi?id=142449
+
+ Reviewed by Brent Fulgham.
+
+ Rather than tracking 'layerBounds' and 'haveComputedBounds' separately, group them together
+ in an OverlapExtent struct and add a function to compute the bounds, which removes
+ a copy of this code. OverlapExtent will be extended in a future patch.
+
+ No behavior change.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::OverlapMap::geometryMap): Allow const access to
+ the geometryMap, used by computeExtent().
+ (WebCore::RenderLayerCompositor::computeExtent):
+ (WebCore::RenderLayerCompositor::addToOverlapMap):
+ (WebCore::RenderLayerCompositor::addToOverlapMapRecursive):
+ (WebCore::RenderLayerCompositor::computeCompositingRequirements):
+ * rendering/RenderLayerCompositor.h:
+
</ins><span class="cx"> 2015-03-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in WebCore::NotificationCenter::stop()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (181244 => 181245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-03-08 10:50:22 UTC (rev 181244)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-03-08 17:02:16 UTC (rev 181245)
</span><span class="lines">@@ -180,6 +180,7 @@
</span><span class="cx"> m_overlapStack.removeLast();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ const RenderGeometryMap& geometryMap() const { return m_geometryMap; }
</ins><span class="cx"> RenderGeometryMap& geometryMap() { return m_geometryMap; }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -255,6 +256,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+struct RenderLayerCompositor::OverlapExtent {
+ LayoutRect bounds;
+ bool extentComputed { false };
+};
+
</ins><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> static inline bool compositingLogEnabled()
</span><span class="cx"> {
</span><span class="lines">@@ -1117,20 +1123,27 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerCompositor::addToOverlapMap(OverlapMap& overlapMap, RenderLayer& layer, LayoutRect& layerBounds, bool& boundsComputed)
</del><ins>+void RenderLayerCompositor::computeExtent(const OverlapMap& overlapMap, RenderLayer& layer, OverlapExtent& extent) const
</ins><span class="cx"> {
</span><ins>+ if (extent.extentComputed)
+ return;
+
+ // FIXME: If this layer's overlap bounds include its children, we don't need to add its
+ // children's bounds to the overlap map.
+ extent.bounds = enclosingLayoutRect(overlapMap.geometryMap().absoluteRect(layer.overlapBounds()));
+ // Empty rects never intersect, but we need them to for the purposes of overlap testing.
+ if (extent.bounds.isEmpty())
+ extent.bounds.setSize(LayoutSize(1, 1));
+
+ extent.extentComputed = true;
+}
+
+void RenderLayerCompositor::addToOverlapMap(OverlapMap& overlapMap, RenderLayer& layer, OverlapExtent& extent)
+{
</ins><span class="cx"> if (layer.isRootLayer())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!boundsComputed) {
- // FIXME: If this layer's overlap bounds include its children, we don't need to add its
- // children's bounds to the overlap map.
- layerBounds = enclosingLayoutRect(overlapMap.geometryMap().absoluteRect(layer.overlapBounds()));
- // Empty rects never intersect, but we need them to for the purposes of overlap testing.
- if (layerBounds.isEmpty())
- layerBounds.setSize(LayoutSize(1, 1));
- boundsComputed = true;
- }
</del><ins>+ computeExtent(overlapMap, layer, extent);
</ins><span class="cx">
</span><span class="cx"> LayoutRect clipRect = layer.backgroundClipRect(RenderLayer::ClipRectsContext(&rootRenderLayer(), AbsoluteClipRects)).rect(); // FIXME: Incorrect for CSS regions.
</span><span class="cx">
</span><span class="lines">@@ -1141,7 +1154,7 @@
</span><span class="cx"> if (!settings.delegatesPageScaling())
</span><span class="cx"> clipRect.scale(pageScaleFactor());
</span><span class="cx"> #endif
</span><del>- clipRect.intersect(layerBounds);
</del><ins>+ clipRect.intersect(extent.bounds);
</ins><span class="cx"> overlapMap.add(&layer, clipRect);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1154,9 +1167,8 @@
</span><span class="cx"> if (ancestorLayer)
</span><span class="cx"> overlapMap.geometryMap().pushMappingsToAncestor(&layer, ancestorLayer);
</span><span class="cx">
</span><del>- LayoutRect bounds;
- bool haveComputedBounds = false;
- addToOverlapMap(overlapMap, layer, bounds, haveComputedBounds);
</del><ins>+ OverlapExtent layerExtent;
+ addToOverlapMap(overlapMap, layer, layerExtent);
</ins><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> LayerListMutationDetector mutationChecker(&layer);
</span><span class="lines">@@ -1222,7 +1234,6 @@
</span><span class="cx"> // if this flow thread will not be painted (for instance because of having no regions, or only invalid regions),
</span><span class="cx"> // the child layers will never have their lists updated (which would normally happen during painting).
</span><span class="cx"> layer.updateDescendantsLayerListsIfNeeded(true);
</span><del>-
</del><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1238,19 +1249,14 @@
</span><span class="cx"> bool willBeComposited = needsToBeComposited(layer);
</span><span class="cx">
</span><span class="cx"> RenderLayer::IndirectCompositingReason compositingReason = compositingState.subtreeIsCompositing ? RenderLayer::IndirectCompositingReason::Stacking : RenderLayer::IndirectCompositingReason::None;
</span><del>- bool haveComputedBounds = false;
- LayoutRect absBounds;
</del><span class="cx">
</span><ins>+ OverlapExtent layerExtent;
+
</ins><span class="cx"> // If we know for sure the layer is going to be composited, don't bother looking it up in the overlap map
</span><span class="cx"> if (!willBeComposited && !overlapMap.isEmpty() && compositingState.testingOverlap) {
</span><ins>+ computeExtent(overlapMap, layer, layerExtent);
</ins><span class="cx"> // If we're testing for overlap, we only need to composite if we overlap something that is already composited.
</span><del>- absBounds = enclosingLayoutRect(overlapMap.geometryMap().absoluteRect(layer.overlapBounds()));
-
- // Empty rects never intersect, but we need them to for the purposes of overlap testing.
- if (absBounds.isEmpty())
- absBounds.setSize(LayoutSize(1, 1));
- haveComputedBounds = true;
- compositingReason = overlapMap.overlapsLayers(absBounds) ? RenderLayer::IndirectCompositingReason::Overlap : RenderLayer::IndirectCompositingReason::None;
</del><ins>+ compositingReason = overlapMap.overlapsLayers(layerExtent.bounds) ? RenderLayer::IndirectCompositingReason::Overlap : RenderLayer::IndirectCompositingReason::None;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="lines">@@ -1353,7 +1359,7 @@
</span><span class="cx"> // the overlap map. Layers that do not composite will draw into their
</span><span class="cx"> // compositing ancestor's backing, and so are still considered for overlap.
</span><span class="cx"> if (childState.compositingAncestor && !childState.compositingAncestor->isRootLayer())
</span><del>- addToOverlapMap(overlapMap, layer, absBounds, haveComputedBounds);
</del><ins>+ addToOverlapMap(overlapMap, layer, layerExtent);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> layer.setHasNotIsolatedCompositedBlendingDescendants(childState.hasNotIsolatedCompositedBlendingDescendants);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (181244 => 181245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2015-03-08 10:50:22 UTC (rev 181244)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2015-03-08 17:02:16 UTC (rev 181245)
</span><span class="lines">@@ -310,6 +310,7 @@
</span><span class="cx"> private:
</span><span class="cx"> class OverlapMap;
</span><span class="cx"> struct CompositingState;
</span><ins>+ struct OverlapExtent;
</ins><span class="cx">
</span><span class="cx"> // GraphicsLayerClient implementation
</span><span class="cx"> virtual void notifyFlushRequired(const GraphicsLayer*) override;
</span><span class="lines">@@ -336,7 +337,8 @@
</span><span class="cx"> // Repaint this and its child layers.
</span><span class="cx"> void recursiveRepaintLayer(RenderLayer&);
</span><span class="cx">
</span><del>- void addToOverlapMap(OverlapMap&, RenderLayer&, LayoutRect& layerBounds, bool& boundsComputed);
</del><ins>+ void computeExtent(const OverlapMap&, RenderLayer&, OverlapExtent&) const;
+ void addToOverlapMap(OverlapMap&, RenderLayer&, OverlapExtent&);
</ins><span class="cx"> void addToOverlapMapRecursive(OverlapMap&, RenderLayer&, RenderLayer* ancestorLayer = nullptr);
</span><span class="cx">
</span><span class="cx"> void updateCompositingLayersTimerFired();
</span></span></pre>
</div>
</div>
</body>
</html>