| Index: Source/core/paint/DeprecatedPaintLayer.cpp
|
| diff --git a/Source/core/paint/DeprecatedPaintLayer.cpp b/Source/core/paint/DeprecatedPaintLayer.cpp
|
| index 30e08b8b8cb0e32aa140fdf3cd0c608f1cc51040..03f00a73fb9d380d8b05cdd9e8aca456ded9c5e8 100644
|
| --- a/Source/core/paint/DeprecatedPaintLayer.cpp
|
| +++ b/Source/core/paint/DeprecatedPaintLayer.cpp
|
| @@ -161,7 +161,7 @@ DeprecatedPaintLayer::~DeprecatedPaintLayer()
|
| if (groupedMapping()) {
|
| DisableCompositingQueryAsserts disabler;
|
| groupedMapping()->removeLayerFromSquashingGraphicsLayer(this);
|
| - setGroupedMapping(0);
|
| + setGroupedMapping(0, true);
|
| }
|
|
|
| // Child layers will be deleted by their corresponding layout objects, so
|
| @@ -2352,17 +2352,17 @@ void DeprecatedPaintLayer::clearCompositedDeprecatedPaintLayerMapping(bool layer
|
| updateOrRemoveFilterEffectBuilder();
|
| }
|
|
|
| -void DeprecatedPaintLayer::setGroupedMapping(CompositedDeprecatedPaintLayerMapping* groupedMapping, bool layerBeingDestroyed)
|
| +void DeprecatedPaintLayer::setGroupedMapping(CompositedDeprecatedPaintLayerMapping* groupedMapping, bool issueInvalidations)
|
| {
|
| if (groupedMapping == m_groupedMapping)
|
| return;
|
|
|
| - if (!layerBeingDestroyed && m_groupedMapping) {
|
| + if (issueInvalidations && m_groupedMapping) {
|
| m_groupedMapping->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateSubtree);
|
| m_groupedMapping->removeLayerFromSquashingGraphicsLayer(this);
|
| }
|
| m_groupedMapping = groupedMapping;
|
| - if (!layerBeingDestroyed && m_groupedMapping)
|
| + if (issueInvalidations && m_groupedMapping)
|
| m_groupedMapping->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateSubtree);
|
| }
|
|
|
|
|