<!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>[174658] 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/174658">174658</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-13 14:33:22 -0700 (Mon, 13 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop unnecessary overlapMap null checks in computeCompositingRequirements()
https://bugs.webkit.org/show_bug.cgi?id=137668
Reviewed by Andreas Kling.
Drop unnecessary overlapMap null checks in computeCompositingRequirements().
The function is never called with a null overlapMap so we can make the
argument a reference and drop all the null checks.
No new tests, no behavior change.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::updateCompositingLayers):
(WebCore::RenderLayerCompositor::computeCompositingRequirementsForNamedFlowFixed):
(WebCore::RenderLayerCompositor::computeCompositingRequirements):
(WebCore::RenderLayerCompositor::computeRegionCompositingRequirements):
* 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 (174657 => 174658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-13 20:59:32 UTC (rev 174657)
+++ trunk/Source/WebCore/ChangeLog 2014-10-13 21:33:22 UTC (rev 174658)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-10-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Drop unnecessary overlapMap null checks in computeCompositingRequirements()
+ https://bugs.webkit.org/show_bug.cgi?id=137668
+
+ Reviewed by Andreas Kling.
+
+ Drop unnecessary overlapMap null checks in computeCompositingRequirements().
+ The function is never called with a null overlapMap so we can make the
+ argument a reference and drop all the null checks.
+
+ No new tests, no behavior change.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::updateCompositingLayers):
+ (WebCore::RenderLayerCompositor::computeCompositingRequirementsForNamedFlowFixed):
+ (WebCore::RenderLayerCompositor::computeCompositingRequirements):
+ (WebCore::RenderLayerCompositor::computeRegionCompositingRequirements):
+ * rendering/RenderLayerCompositor.h:
+
+2014-10-13 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Use is<>() / downcast<>() for PlatformCALayer subclasses
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137661
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (174657 => 174658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-10-13 20:59:32 UTC (rev 174657)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-10-13 21:33:22 UTC (rev 174658)
</span><span class="lines">@@ -726,7 +726,7 @@
</span><span class="cx"> bool layersChanged = false;
</span><span class="cx"> bool saw3DTransform = false;
</span><span class="cx"> OverlapMap overlapTestRequestMap;
</span><del>- computeCompositingRequirements(nullptr, *updateRoot, &overlapTestRequestMap, compState, layersChanged, saw3DTransform);
</del><ins>+ computeCompositingRequirements(nullptr, *updateRoot, overlapTestRequestMap, compState, layersChanged, saw3DTransform);
</ins><span class="cx"> needHierarchyUpdate |= layersChanged;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1145,7 +1145,7 @@
</span><span class="cx"> overlapMap.geometryMap().popMappingsToAncestor(ancestorLayer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerCompositor::computeCompositingRequirementsForNamedFlowFixed(RenderLayer& layer, OverlapMap* overlapMap, CompositingState& childState, bool& layersChanged, bool& anyDescendantHas3DTransform)
</del><ins>+void RenderLayerCompositor::computeCompositingRequirementsForNamedFlowFixed(RenderLayer& layer, OverlapMap& overlapMap, CompositingState& childState, bool& layersChanged, bool& anyDescendantHas3DTransform)
</ins><span class="cx"> {
</span><span class="cx"> if (!layer.isRootLayer())
</span><span class="cx"> return;
</span><span class="lines">@@ -1171,7 +1171,7 @@
</span><span class="cx"> // must be compositing so that its contents render over that child.
</span><span class="cx"> // This implies that its positive z-index children must also be compositing.
</span><span class="cx"> //
</span><del>-void RenderLayerCompositor::computeCompositingRequirements(RenderLayer* ancestorLayer, RenderLayer& layer, OverlapMap* overlapMap, CompositingState& compositingState, bool& layersChanged, bool& descendantHas3DTransform)
</del><ins>+void RenderLayerCompositor::computeCompositingRequirements(RenderLayer* ancestorLayer, RenderLayer& layer, OverlapMap& overlapMap, CompositingState& compositingState, bool& layersChanged, bool& descendantHas3DTransform)
</ins><span class="cx"> {
</span><span class="cx"> layer.updateDescendantDependentFlags();
</span><span class="cx"> layer.updateLayerListsIfNeeded();
</span><span class="lines">@@ -1188,8 +1188,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (overlapMap)
- overlapMap->geometryMap().pushMappingsToAncestor(&layer, ancestorLayer);
</del><ins>+ overlapMap.geometryMap().pushMappingsToAncestor(&layer, ancestorLayer);
</ins><span class="cx">
</span><span class="cx"> // Clear the flag
</span><span class="cx"> layer.setHasCompositingDescendant(false);
</span><span class="lines">@@ -1205,15 +1204,15 @@
</span><span class="cx"> IntRect absBounds;
</span><span class="cx">
</span><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><del>- if (!willBeComposited && overlapMap && !overlapMap->isEmpty() && compositingState.m_testingOverlap) {
</del><ins>+ if (!willBeComposited && !overlapMap.isEmpty() && compositingState.m_testingOverlap) {
</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 = enclosingIntRect(overlapMap->geometryMap().absoluteRect(layer.overlapBounds()));
</del><ins>+ absBounds = enclosingIntRect(overlapMap.geometryMap().absoluteRect(layer.overlapBounds()));
</ins><span class="cx">
</span><span class="cx"> // Empty rects never intersect, but we need them to for the purposes of overlap testing.
</span><span class="cx"> if (absBounds.isEmpty())
</span><span class="cx"> absBounds.setSize(IntSize(1, 1));
</span><span class="cx"> haveComputedBounds = true;
</span><del>- compositingReason = overlapMap->overlapsLayers(absBounds) ? RenderLayer::IndirectCompositingReason::Overlap : RenderLayer::IndirectCompositingReason::None;
</del><ins>+ compositingReason = overlapMap.overlapsLayers(absBounds) ? 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">@@ -1247,8 +1246,7 @@
</span><span class="cx"> // This layer now acts as the ancestor for kids.
</span><span class="cx"> childState.m_compositingAncestor = &layer;
</span><span class="cx">
</span><del>- if (overlapMap)
- overlapMap->pushCompositingContainer();
</del><ins>+ overlapMap.pushCompositingContainer();
</ins><span class="cx"> // This layer is going to be composited, so children can safely ignore the fact that there's an
</span><span class="cx"> // animation running behind this layer, meaning they can rely on the overlap map testing again.
</span><span class="cx"> childState.m_testingOverlap = true;
</span><span class="lines">@@ -1271,8 +1269,7 @@
</span><span class="cx"> // make layer compositing
</span><span class="cx"> layer.setIndirectCompositingReason(RenderLayer::IndirectCompositingReason::BackgroundLayer);
</span><span class="cx"> childState.m_compositingAncestor = &layer;
</span><del>- if (overlapMap)
- overlapMap->pushCompositingContainer();
</del><ins>+ overlapMap.pushCompositingContainer();
</ins><span class="cx"> // This layer is going to be composited, so children can safely ignore the fact that there's an
</span><span class="cx"> // animation running behind this layer, meaning they can rely on the overlap map testing again
</span><span class="cx"> childState.m_testingOverlap = true;
</span><span class="lines">@@ -1317,8 +1314,8 @@
</span><span class="cx"> // All layers (even ones that aren't being composited) need to get added to
</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><del>- if (overlapMap && childState.m_compositingAncestor && !childState.m_compositingAncestor->isRootLayer())
- addToOverlapMap(*overlapMap, layer, absBounds, haveComputedBounds);
</del><ins>+ if (childState.m_compositingAncestor && !childState.m_compositingAncestor->isRootLayer())
+ addToOverlapMap(overlapMap, layer, absBounds, haveComputedBounds);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> layer.setHasNotIsolatedCompositedBlendingDescendants(childState.m_hasNotIsolatedCompositedBlendingDescendants);
</span><span class="lines">@@ -1330,10 +1327,8 @@
</span><span class="cx"> && requiresCompositingForIndirectReason(layer.renderer(), childState.m_subtreeIsCompositing, anyDescendantHas3DTransform, indirectCompositingReason)) {
</span><span class="cx"> layer.setIndirectCompositingReason(indirectCompositingReason);
</span><span class="cx"> childState.m_compositingAncestor = &layer;
</span><del>- if (overlapMap) {
- overlapMap->pushCompositingContainer();
- addToOverlapMapRecursive(*overlapMap, layer);
- }
</del><ins>+ overlapMap.pushCompositingContainer();
+ addToOverlapMapRecursive(overlapMap, layer);
</ins><span class="cx"> willBeComposited = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1363,10 +1358,8 @@
</span><span class="cx"> if (isCompositedClippingLayer) {
</span><span class="cx"> if (!willBeComposited) {
</span><span class="cx"> childState.m_compositingAncestor = &layer;
</span><del>- if (overlapMap) {
- overlapMap->pushCompositingContainer();
- addToOverlapMapRecursive(*overlapMap, layer);
- }
</del><ins>+ overlapMap.pushCompositingContainer();
+ addToOverlapMapRecursive(overlapMap, layer);
</ins><span class="cx"> willBeComposited = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1377,8 +1370,8 @@
</span><span class="cx"> compositingState.m_hasNotIsolatedCompositedBlendingDescendants = true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (overlapMap && childState.m_compositingAncestor == &layer && !layer.isRootLayer())
- overlapMap->popCompositingContainer();
</del><ins>+ if (childState.m_compositingAncestor == &layer && !layer.isRootLayer())
+ overlapMap.popCompositingContainer();
</ins><span class="cx">
</span><span class="cx"> // If we're back at the root, and no other layers need to be composited, and the root layer itself doesn't need
</span><span class="cx"> // to be composited, then we can drop out of compositing mode altogether. However, don't drop out of compositing mode
</span><span class="lines">@@ -1405,19 +1398,17 @@
</span><span class="cx">
</span><span class="cx"> descendantHas3DTransform |= anyDescendantHas3DTransform || layer.has3DTransform();
</span><span class="cx">
</span><del>- if (overlapMap)
- overlapMap->geometryMap().popMappingsToAncestor(ancestorLayer);
</del><ins>+ overlapMap.geometryMap().popMappingsToAncestor(ancestorLayer);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerCompositor::computeRegionCompositingRequirements(RenderNamedFlowFragment* region, OverlapMap* overlapMap, CompositingState& childState, bool& layersChanged, bool& anyDescendantHas3DTransform)
</del><ins>+void RenderLayerCompositor::computeRegionCompositingRequirements(RenderNamedFlowFragment* region, OverlapMap& overlapMap, CompositingState& childState, bool& layersChanged, bool& anyDescendantHas3DTransform)
</ins><span class="cx"> {
</span><span class="cx"> if (!region->isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RenderFlowThread* flowThread = region->flowThread();
</span><span class="cx">
</span><del>- if (overlapMap)
- overlapMap->geometryMap().pushRenderFlowThread(flowThread);
</del><ins>+ overlapMap.geometryMap().pushRenderFlowThread(flowThread);
</ins><span class="cx">
</span><span class="cx"> if (const RenderLayerList* layerList = flowThread->getLayerListForRegion(region)) {
</span><span class="cx"> for (size_t i = 0, listSize = layerList->size(); i < listSize; ++i) {
</span><span class="lines">@@ -1427,8 +1418,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (overlapMap)
- overlapMap->geometryMap().popMappingsToAncestor(&region->layerOwner());
</del><ins>+ overlapMap.geometryMap().popMappingsToAncestor(&region->layerOwner());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::setCompositingParent(RenderLayer& childLayer, RenderLayer* parentLayer)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (174657 => 174658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-10-13 20:59:32 UTC (rev 174657)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-10-13 21:33:22 UTC (rev 174658)
</span><span class="lines">@@ -339,11 +339,11 @@
</span><span class="cx"> void updateCompositingLayersTimerFired(Timer<RenderLayerCompositor>&);
</span><span class="cx">
</span><span class="cx"> // Returns true if any layer's compositing changed
</span><del>- void computeCompositingRequirements(RenderLayer* ancestorLayer, RenderLayer&, OverlapMap*, struct CompositingState&, bool& layersChanged, bool& descendantHas3DTransform);
</del><ins>+ void computeCompositingRequirements(RenderLayer* ancestorLayer, RenderLayer&, OverlapMap&, struct CompositingState&, bool& layersChanged, bool& descendantHas3DTransform);
</ins><span class="cx">
</span><del>- void computeRegionCompositingRequirements(RenderNamedFlowFragment*, OverlapMap*, CompositingState&, bool& layersChanged, bool& anyDescendantHas3DTransform);
</del><ins>+ void computeRegionCompositingRequirements(RenderNamedFlowFragment*, OverlapMap&, CompositingState&, bool& layersChanged, bool& anyDescendantHas3DTransform);
</ins><span class="cx">
</span><del>- void computeCompositingRequirementsForNamedFlowFixed(RenderLayer&, OverlapMap*, CompositingState&, bool& layersChanged, bool& anyDescendantHas3DTransform);
</del><ins>+ void computeCompositingRequirementsForNamedFlowFixed(RenderLayer&, OverlapMap&, CompositingState&, bool& layersChanged, bool& anyDescendantHas3DTransform);
</ins><span class="cx">
</span><span class="cx"> // Recurses down the tree, parenting descendant compositing layers and collecting an array of child layers for the current compositing layer.
</span><span class="cx"> void rebuildCompositingLayerTree(RenderLayer&, Vector<GraphicsLayer*>& childGraphicsLayersOfEnclosingLayer, int depth);
</span></span></pre>
</div>
</div>
</body>
</html>