Invalidate non-self-painting-layer descendants when creating a layer

third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

Index: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
index 1794f1c2bc07306de8fc59e3f16e6924de415167..a6a70d4d6ce1618f8e549bc9d762df4cd44deb39 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
@@ -280,21 +280,10 @@ void LayoutBoxModelObject::styleDidChange(StyleDifference diff, const ComputedSt
 
 void LayoutBoxModelObject::createLayer(PaintLayerType type)
 {
-
     // Acquiring a PaintLayer may change the paint invalidation container. Therefore we must eagerly
     // invalidate paint for this object before creating the layer.
-    if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled() && isRooted()) {
-        DisablePaintInvalidationStateAsserts invalidationDisabler;
-        DisableCompositingQueryAsserts compositingDisabler;
-
-        // It would be more correct to call invalidatePaintIncludingNonCompositingDescendants, but
-        // we do this instead to avoid performance issues when creating large numbers of layers.
-        const LayoutBoxModelObject& paintInvalidationContainer = containerForPaintInvalidationOnRootedTree();
-        invalidatePaintUsingContainer(
-            paintInvalidationContainer,
-            boundsRectForPaintInvalidation(&paintInvalidationContainer),
-            PaintInvalidationLayer);
-    }
+    if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled() && isRooted())
+        invalidatePaintIncludingNonLayerDescendants();
 
     ASSERT(!m_layer);
     m_layer = adoptPtr(new PaintLayer(this, type));