Index: Source/core/rendering/compositing/RenderLayerCompositor.cpp |
diff --git a/Source/core/rendering/compositing/RenderLayerCompositor.cpp b/Source/core/rendering/compositing/RenderLayerCompositor.cpp |
index 7e19f4772a2deb5eaf5a1e2724052a4c560f56c6..963600020937b6175ddcde1113bb2883769a440d 100644 |
--- a/Source/core/rendering/compositing/RenderLayerCompositor.cpp |
+++ b/Source/core/rendering/compositing/RenderLayerCompositor.cpp |
@@ -372,6 +372,7 @@ void RenderLayerCompositor::setNeedsCompositingUpdate(CompositingUpdateType upda |
break; |
case CompositingUpdateAfterLayout: |
m_needsToRecomputeCompositingRequirements = true; |
+ m_needsToUpdateLayerTreeGeometry = true; |
break; |
case CompositingUpdateOnScroll: |
m_needsToRecomputeCompositingRequirements = true; // Overlap can change with scrolling, so need to check for hierarchy updates. |
@@ -1406,40 +1407,6 @@ bool RenderLayerCompositor::parentFrameContentLayers(RenderPart* renderer) |
return true; |
} |
-// Recurs down the RenderLayer tree until its finds the compositing descendants of compositingAncestor and updates their geometry. |
-void RenderLayerCompositor::updateCompositingDescendantGeometry(RenderLayerStackingNode* compositingAncestor, RenderLayer* layer) |
-{ |
- if (layer->stackingNode() != compositingAncestor) { |
- if (layer->hasCompositedLayerMapping()) { |
- CompositedLayerMappingPtr compositedLayerMapping = layer->compositedLayerMapping(); |
- compositedLayerMapping->updateCompositedBounds(GraphicsLayerUpdater::ForceUpdate); |
- |
- if (layer->reflectionInfo()) { |
- RenderLayer* reflectionLayer = layer->reflectionInfo()->reflectionLayer(); |
- if (reflectionLayer->hasCompositedLayerMapping()) |
- reflectionLayer->compositedLayerMapping()->updateCompositedBounds(GraphicsLayerUpdater::ForceUpdate); |
- } |
- |
- compositedLayerMapping->updateGraphicsLayerGeometry(GraphicsLayerUpdater::ForceUpdate); |
- return; |
- } |
- } |
- |
- if (layer->reflectionInfo()) |
- updateCompositingDescendantGeometry(compositingAncestor, layer->reflectionInfo()->reflectionLayer()); |
- |
- if (!layer->hasCompositingDescendant()) |
- return; |
- |
-#if !ASSERT_DISABLED |
- LayerListMutationDetector mutationChecker(layer->stackingNode()); |
-#endif |
- |
- RenderLayerStackingNodeIterator iterator(*layer->stackingNode(), AllChildren); |
- while (RenderLayerStackingNode* curNode = iterator.next()) |
- updateCompositingDescendantGeometry(compositingAncestor, curNode->layer()); |
-} |
- |
void RenderLayerCompositor::repaintCompositedLayers() |
{ |
recursiveRepaintLayer(rootRenderLayer()); |