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

third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/paint/PaintControllerPaintTest.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
@@ skipping 254 matching lines @@
     EXPECT_FALSE(nonSelfPaintingLayer.needsPaintPhaseDescendantOutlines());
     EXPECT_TRUE(displayItemListContains(rootPaintController().getDisplayItemList(), selfPaintingLayerObject, DisplayItem::paintPhaseToDrawingType(PaintPhaseSelfOutlineOnly)));
 
     // needsPaintPhaseDescendantOutlines should be set when any descendant on the same layer has outline.
     toHTMLElement(outlineDiv.node())->setAttribute(HTMLNames::styleAttr, styleWithOutline);
     document().view()->updateAllLifecyclePhasesExceptPaint();
     EXPECT_TRUE(selfPaintingLayer.needsPaintPhaseDescendantOutlines());
     EXPECT_FALSE(nonSelfPaintingLayer.needsPaintPhaseDescendantOutlines());
     paint();
     EXPECT_TRUE(displayItemListContains(rootPaintController().getDisplayItemList(), outlineDiv, DisplayItem::paintPhaseToDrawingType(PaintPhaseSelfOutlineOnly)));
+
+    // needsPaintPhaseDescendantOutlines should be reset when no outline is actually painted.
+    toHTMLElement(outlineDiv.node())->setAttribute(HTMLNames::styleAttr, styleWithoutOutline);
+    document().view()->updateAllLifecyclePhases();
+    EXPECT_FALSE(selfPaintingLayer.needsPaintPhaseDescendantOutlines());
 }
 
 TEST_P(PaintLayerPainterTest, PaintPhaseFloat)
 {
     AtomicString styleWithoutFloat = "width: 50px; height: 50px; background-color: green";
     AtomicString styleWithFloat = "float: left; " + styleWithoutFloat;
     setBodyInnerHTML(
         "<div id='self-painting-layer' style='position: absolute'>"
         "  <div id='non-self-painting-layer' style='overflow: hidden'>"
         "    <div>"
@@ skipping 15 matching lines @@
     EXPECT_FALSE(selfPaintingLayer.needsPaintPhaseFloat());
     EXPECT_FALSE(nonSelfPaintingLayer.needsPaintPhaseFloat());
 
     // needsPaintPhaseFloat should be set when any descendant on the same layer has float.
     toHTMLElement(floatDiv.node())->setAttribute(HTMLNames::styleAttr, styleWithFloat);
     document().view()->updateAllLifecyclePhasesExceptPaint();
     EXPECT_TRUE(selfPaintingLayer.needsPaintPhaseFloat());
     EXPECT_FALSE(nonSelfPaintingLayer.needsPaintPhaseFloat());
     paint();
     EXPECT_TRUE(displayItemListContains(rootPaintController().getDisplayItemList(), floatDiv, DisplayItem::kBoxDecorationBackground));
+
+    // needsPaintPhaseFloat should be reset when there is no float actually painted.
+    toHTMLElement(floatDiv.node())->setAttribute(HTMLNames::styleAttr, styleWithoutFloat);
+    document().view()->updateAllLifecyclePhases();
+    EXPECT_FALSE(selfPaintingLayer.needsPaintPhaseFloat());
 }
 
 TEST_P(PaintLayerPainterTest, PaintPhaseFloatUnderInlineLayer)
 {
     setBodyInnerHTML(
         "<div id='self-painting-layer' style='position: absolute'>"
         "  <div id='non-self-painting-layer' style='overflow: hidden'>"
         "    <span id='span' style='position: relative'>"
         "      <div id='float' style='width: 10px; height: 10px; background-color: blue; float: left'></div>"
         "    </span>"
@@ skipping 51 matching lines @@
     EXPECT_FALSE(nonSelfPaintingLayer.needsPaintPhaseDescendantBlockBackgrounds());
     EXPECT_TRUE(displayItemListContains(rootPaintController().getDisplayItemList(), selfPaintingLayerObject, DisplayItem::kBoxDecorationBackground));
 
     // needsPaintPhaseDescendantBlockBackgrounds should be set when any descendant on the same layer has Background.
     toHTMLElement(backgroundDiv.node())->setAttribute(HTMLNames::styleAttr, styleWithBackground);
     document().view()->updateAllLifecyclePhasesExceptPaint();
     EXPECT_TRUE(selfPaintingLayer.needsPaintPhaseDescendantBlockBackgrounds());
     EXPECT_FALSE(nonSelfPaintingLayer.needsPaintPhaseDescendantBlockBackgrounds());
     paint();
     EXPECT_TRUE(displayItemListContains(rootPaintController().getDisplayItemList(), backgroundDiv, DisplayItem::kBoxDecorationBackground));
+
+    // needsPaintPhaseDescendantBlockBackgrounds should be reset when no outline is actually painted.
+    toHTMLElement(backgroundDiv.node())->setAttribute(HTMLNames::styleAttr, styleWithoutBackground);
+    document().view()->updateAllLifecyclePhases();
+    EXPECT_FALSE(selfPaintingLayer.needsPaintPhaseDescendantBlockBackgrounds());
 }
 
 TEST_P(PaintLayerPainterTest, PaintPhasesUpdateOnLayerRemoval)
 {
     setBodyInnerHTML(
         "<div id='layer' style='position: relative'>"
         "  <div style='height: 100px'>"
         "    <div style='height: 20px; outline: 1px solid red; background-color: green'>outline and background</div>"
         "    <div style='float: left'>float</div>"
         "  </div>"
@@ skipping 137 matching lines @@
     PaintLayer& layer = *table.layer();
     EXPECT_TRUE(layer.isSelfPaintingLayer());
     EXPECT_FALSE(layer.needsPaintPhaseDescendantBlockBackgrounds());
 
     toHTMLElement(table.node())->setAttribute(HTMLNames::styleAttr, "position: relative; border-collapse: collapse");
     document().view()->updateAllLifecyclePhases();
     EXPECT_TRUE(layer.needsPaintPhaseDescendantBlockBackgrounds());
 }
 
 } // namespace blink