Index: Source/core/rendering/compositing/CompositedLayerMapping.cpp |
diff --git a/Source/core/rendering/compositing/CompositedLayerMapping.cpp b/Source/core/rendering/compositing/CompositedLayerMapping.cpp |
index 70fbf7f15bc36f1a3d104c79aefae6f7205fd51e..c0b96abf9d53c25f4e59b5de39a46fbefa81c7c3 100644 |
--- a/Source/core/rendering/compositing/CompositedLayerMapping.cpp |
+++ b/Source/core/rendering/compositing/CompositedLayerMapping.cpp |
@@ -554,7 +554,7 @@ void CompositedLayerMapping::computeBoundsOfOwningLayer(const RenderLayer* compo |
} |
void CompositedLayerMapping::updateSquashingLayerGeometry(const LayoutPoint& offsetFromCompositedAncestor, const IntPoint& graphicsLayerParentLocation, const RenderLayer& referenceLayer, |
- Vector<GraphicsLayerPaintInfo>& layers, GraphicsLayer* squashingLayer, LayoutPoint* offsetFromTransformedAncestor, Vector<RenderLayer*>& layersNeedingPaintInvalidation) |
+ Vector<GraphicsLayerPaintInfo>& layers, GraphicsLayer* squashingLayer, LayoutPoint* offsetFromTransformedAncestor, LayersNeedingPaintInvalidation& layersNeedingPaintInvalidation) |
{ |
if (!squashingLayer) |
return; |
@@ -608,7 +608,8 @@ void CompositedLayerMapping::updateSquashingLayerGeometry(const LayoutPoint& off |
LayoutSize subpixelAccumulation = offsetFromSquashLayerOrigin + newOffsetFromRenderer; |
if (layers[i].offsetFromRendererSet && layers[i].offsetFromRenderer != newOffsetFromRenderer) { |
layers[i].renderLayer->paintInvalidator().paintInvalidationIncludingNonCompositingDescendants(); |
- layersNeedingPaintInvalidation.append(layers[i].renderLayer); |
+ |
+ layersNeedingPaintInvalidation.append(std::make_pair(layers[i].renderLayer, InspectorLayerInvalidationTrackingEvent::SquashingLayerGeometryWasUpdated)); |
} |
layers[i].offsetFromRenderer = newOffsetFromRenderer; |
layers[i].offsetFromRendererSet = true; |
@@ -626,7 +627,7 @@ void CompositedLayerMapping::updateSquashingLayerGeometry(const LayoutPoint& off |
layers[i].localClipRectForSquashedLayer = localClipRectForSquashedLayer(referenceLayer, layers[i], layers); |
} |
-void CompositedLayerMapping::updateGraphicsLayerGeometry(const RenderLayer* compositingContainer, const RenderLayer* compositingStackingContext, Vector<RenderLayer*>& layersNeedingPaintInvalidation) |
+void CompositedLayerMapping::updateGraphicsLayerGeometry(const RenderLayer* compositingContainer, const RenderLayer* compositingStackingContext, LayersNeedingPaintInvalidation& layersNeedingPaintInvalidation) |
{ |
ASSERT(m_owningLayer.compositor()->lifecycle().state() == DocumentLifecycle::InCompositingUpdate); |
@@ -864,7 +865,7 @@ void CompositedLayerMapping::updateTransformGeometry(const IntPoint& snappedOffs |
} |
} |
-void CompositedLayerMapping::updateReflectionLayerGeometry(Vector<RenderLayer*>& layersNeedingPaintInvalidation) |
+void CompositedLayerMapping::updateReflectionLayerGeometry(LayersNeedingPaintInvalidation& layersNeedingPaintInvalidation) |
{ |
if (!m_owningLayer.reflectionInfo() || !m_owningLayer.reflectionInfo()->reflectionLayer()->hasCompositedLayerMapping()) |
return; |