Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1204)

Unified Diff: Source/core/rendering/RenderLayer.cpp

Issue 327053002: Rename RenderLayer::updateLayerPositions to updateLayerPositionRecursive (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderLayer.h ('k') | Source/core/rendering/RenderLayerModelObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayer.cpp
diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
index c77bc4f9f1fb9cbfb35a6dc08191385f14678507..f1afd5876a3d556c6e90a45b986098e0b7f8d2da 100644
--- a/Source/core/rendering/RenderLayer.cpp
+++ b/Source/core/rendering/RenderLayer.cpp
@@ -265,10 +265,10 @@ void RenderLayer::updateLayerPositionsAfterLayout(const RenderLayer* rootLayer,
RenderGeometryMap geometryMap(UseTransforms);
if (this != rootLayer)
geometryMap.pushMappingsToAncestor(parent(), 0);
- updateLayerPositions(&geometryMap, rootLayer->renderer()->containerForRepaint(), flags);
+ updateLayerPositionRecursive(&geometryMap, rootLayer->renderer()->containerForRepaint(), flags);
}
-void RenderLayer::updateLayerPositions(RenderGeometryMap* geometryMap, const RenderLayerModelObject* paintInvalidationContainer, UpdateLayerPositionsFlags flags)
+void RenderLayer::updateLayerPositionRecursive(RenderGeometryMap* geometryMap, const RenderLayerModelObject* paintInvalidationContainer, UpdateLayerPositionsFlags flags)
{
// For performance reasons we only check if the RenderObject has moved if we
// have a geometryMap. If not, blank out the paint invalidation container so we
@@ -333,7 +333,7 @@ void RenderLayer::updateLayerPositions(RenderGeometryMap* geometryMap, const Ren
flags |= UpdatePagination;
for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
- child->updateLayerPositions(geometryMap, newPaintInvalidationContainer, flags);
+ child->updateLayerPositionRecursive(geometryMap, newPaintInvalidationContainer, flags);
if ((flags & NeedsFullRepaintInBacking) && hasCompositedLayerMapping() && !compositedLayerMapping()->paintsIntoCompositedAncestor())
compositedLayerMapping()->setContentsNeedDisplay();
@@ -1492,7 +1492,7 @@ void RenderLayer::removeOnlyThisLayer()
// Hits in compositing/overflow/automatically-opt-into-composited-scrolling-part-1.html
DisableCompositingQueryAsserts disabler;
- current->updateLayerPositions(0, 0); // FIXME: use geometry map.
+ current->updateLayerPositionRecursive(0, 0); // FIXME: use geometry map.
current = next;
}
@@ -2524,8 +2524,8 @@ void RenderLayer::paintPaginatedChildLayer(RenderLayer* childLayer, GraphicsCont
}
// It is possible for paintLayer() to be called after the child layer ceases to be paginated but before
- // updateLayerPositions() is called and resets the isPaginated() flag, see <rdar://problem/10098679>.
- // If this is the case, just bail out, since the upcoming call to updateLayerPositions() will repaint the layer.
+ // updateLayerPositionRecursive() is called and resets the isPaginated() flag, see <rdar://problem/10098679>.
+ // If this is the case, just bail out, since the upcoming call to updateLayerPositionRecursive() will repaint the layer.
if (!columnLayers.size())
return;
« no previous file with comments | « Source/core/rendering/RenderLayer.h ('k') | Source/core/rendering/RenderLayerModelObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698