Revert of Skip PaintLayer empty paint phases if it previously painted nothing

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

Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index 4b6ebecf3a13c1be0c1fe4ffbd6fab323fd2ae96..9fac7fe176afe39f0a85542658b07ef19e97b4c7 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -1480,15 +1480,15 @@ bool LayoutBox::intersectsVisibleViewport()
 
 PaintInvalidationReason LayoutBox::invalidatePaintIfNeeded(const PaintInvalidationState& paintInvalidationState)
 {
-    PaintLayer& enclosingSelfPaintingLayer = paintInvalidationState.enclosingSelfPaintingLayer(*this);
-    if (enclosingSelfPaintingLayer.layoutObject() != this) {
-        if (isFloating())
-            enclosingSelfPaintingLayer.setNeedsPaintPhaseFloat();
-
-        if (hasBoxDecorationBackground()
-            // We also paint overflow controls in background phase.
-            || (hasOverflowClip() && getScrollableArea()->hasOverflowControls()))
-            enclosingSelfPaintingLayer.setNeedsPaintPhaseDescendantBlockBackgrounds();
+    if (isFloating())
+        paintInvalidationState.enclosingSelfPaintingLayer(*this).setNeedsPaintPhaseFloat();
+
+    if (hasBoxDecorationBackground()
+        // We also paint overflow controls in background phase.
+        || (hasOverflowClip() && getScrollableArea()->hasOverflowControls())) {
+        PaintLayer& layer = paintInvalidationState.enclosingSelfPaintingLayer(*this);
+        if (layer.layoutObject() != this)
+            layer.setNeedsPaintPhaseDescendantBlockBackgrounds();
     }
 
     PaintInvalidationReason fullInvalidationReason = fullPaintInvalidationReason();