Re-land of issue 200623006: Set geometry dirty bits on composited layer mappings w/squashing

Source/core/rendering/RenderLayer.cpp

Index: Source/core/rendering/RenderLayer.cpp
diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
index 2bf77db422f5707a56f4a906df7b2dda6eaa3d09..ef40889fb15879f48508ec0638e98382c9c74ccb 100644
--- a/Source/core/rendering/RenderLayer.cpp
+++ b/Source/core/rendering/RenderLayer.cpp
@@ -165,6 +165,7 @@ RenderLayer::~RenderLayer()
     removeFilterInfoIfNeeded();
 
     if (groupedMapping()) {
+        DisableCompositingQueryAsserts disabler;
         groupedMapping()->removeRenderLayerFromSquashingGraphicsLayer(this);
         setGroupedMapping(0);
     }
@@ -3556,6 +3557,15 @@ void RenderLayer::clearCompositedLayerMapping(bool layerBeingDestroyed)
         updateOrRemoveFilterEffectRenderer();
 }
 
+void RenderLayer::setGroupedMapping(CompositedLayerMapping* groupedMapping, bool layerBeingDestroyed)
+{
+    if (!layerBeingDestroyed && m_groupedMapping)
+        m_groupedMapping->setNeedsGeometryUpdate();
+    m_groupedMapping = groupedMapping;
+    if (!layerBeingDestroyed && m_groupedMapping)
+        m_groupedMapping->setNeedsGeometryUpdate();
+}
+
 bool RenderLayer::hasCompositedMask() const
 {
     return m_compositedLayerMapping && m_compositedLayerMapping->hasMaskLayer();