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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 1462 matching lines @@
     LayoutRect rect = visualOverflowRect();
     LayoutView* layoutView = view();
     while (layoutView->frame()->ownerLayoutObject())
         layoutView = layoutView->frame()->ownerLayoutObject()->view();
     mapToVisibleRectInAncestorSpace(layoutView, rect, nullptr);
     return rect.intersects(LayoutRect(layoutView->frameView()->getScrollableArea()->visibleContentRectDouble()));
 }
 
 PaintInvalidationReason LayoutBox::invalidatePaintIfNeeded(const PaintInvalidationState& paintInvalidationState)
 {
-    PaintLayer& enclosingSelfPaintingLayer = paintInvalidationState.enclosingSelfPaintingLayer(*this);
-    if (enclosingSelfPaintingLayer.layoutObject() != this) {
-        if (isFloating())
-            enclosingSelfPaintingLayer.setNeedsPaintPhaseFloat();
+    if (isFloating())
+        paintInvalidationState.enclosingSelfPaintingLayer(*this).setNeedsPaintPhaseFloat();
 
-        if (hasBoxDecorationBackground()
-            // We also paint overflow controls in background phase.
-            || (hasOverflowClip() && getScrollableArea()->hasOverflowControls()))
-            enclosingSelfPaintingLayer.setNeedsPaintPhaseDescendantBlockBackgrounds();
+    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();
     // If the current paint invalidation reason is PaintInvalidationDelayedFull, then this paint invalidation can delayed if the
     // LayoutBox in question is not on-screen. The logic to decide whether this is appropriate exists at the site of the original
     // paint invalidation that chose PaintInvalidationDelayedFull.
     if (fullInvalidationReason == PaintInvalidationDelayedFull) {
         if (!intersectsVisibleViewport())
             return PaintInvalidationDelayedFull;
 
@@ skipping 3211 matching lines @@
 
 void LayoutBox::clearPercentHeightDescendants()
 {
     for (LayoutObject* curr = slowFirstChild(); curr; curr = curr->nextInPreOrder(this)) {
         if (curr->isBox())
             toLayoutBox(curr)->removeFromPercentHeightContainer();
     }
 }
 
 } // namespace blink