Add FrameView::updateAllLifecyclePhasesExceptPaint and use it in a few cases.

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/compositing/CompositedLayerMapping.h"
 #include "core/paint/PaintControllerPaintTest.h"
 #include "platform/graphics/GraphicsContext.h"
 
 namespace blink {
 
@@ skipping 35 matching lines @@
         TestDisplayItem(container1, backgroundType),
         TestDisplayItem(content1, backgroundType),
         TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
         TestDisplayItem(container2Layer, DisplayItem::Subsequence),
         TestDisplayItem(container2, backgroundType),
         TestDisplayItem(content2, backgroundType),
         TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
         TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
 
     toHTMLElement(content1.node())->setAttribute(HTMLNames::styleAttr, "position: absolute; width: 100px; height: 100px; background-color: green");
-    updateLifecyclePhasesBeforePaint();
+    document().view()->updateAllLifecyclePhasesExceptPaint();
     bool needsCommit = paintWithoutCommit();
 
     EXPECT_DISPLAY_LIST(rootPaintController().newDisplayItemList(), 8,
         TestDisplayItem(layoutView(), cachedDocumentBackgroundType),
         TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
         TestDisplayItem(container1Layer, DisplayItem::Subsequence),
         TestDisplayItem(container1, cachedBackgroundType),
         TestDisplayItem(content1, backgroundType),
         TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
         TestDisplayItem(container2Layer, DisplayItem::CachedSubsequence),
@@ skipping 36 matching lines @@
     PaintLayer& container1Layer = *toLayoutBoxModelObject(container1).layer();
     LayoutObject& content1 = *document().getElementById("content1")->layoutObject();
     LayoutObject& container2 = *document().getElementById("container2")->layoutObject();
     PaintLayer& container2Layer = *toLayoutBoxModelObject(container2).layer();
     LayoutObject& content2a = *document().getElementById("content2a")->layoutObject();
     LayoutObject& content2b = *document().getElementById("content2b")->layoutObject();
     LayoutObject& container3 = *document().getElementById("container3")->layoutObject();
     PaintLayer& container3Layer = *toLayoutBoxModelObject(container3).layer();
     LayoutObject& content3 = *document().getElementById("content3")->layoutObject();
 
-    updateLifecyclePhasesBeforePaint();
+    document().view()->updateAllLifecyclePhasesExceptPaint();
     IntRect interestRect(0, 0, 400, 300);
     paint(&interestRect);
 
     // Container1 is fully in the interest rect;
     // Container2 is partly (including its stacking chidren) in the interest rect;
     // Content2b is out of the interest rect and output nothing;
     // Container3 is partly in the interest rect.
     EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 15,
         TestDisplayItem(layoutView(), documentBackgroundType),
         TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
         TestDisplayItem(container1Layer, DisplayItem::Subsequence),
         TestDisplayItem(container1, backgroundType),
         TestDisplayItem(content1, backgroundType),
         TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
         TestDisplayItem(container2Layer, DisplayItem::Subsequence),
         TestDisplayItem(container2, backgroundType),
         TestDisplayItem(content2a, backgroundType),
         TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
         TestDisplayItem(container3Layer, DisplayItem::Subsequence),
         TestDisplayItem(container3, backgroundType),
         TestDisplayItem(content3, backgroundType),
         TestDisplayItem(container3Layer, DisplayItem::EndSubsequence),
         TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
 
-    updateLifecyclePhasesBeforePaint();
+    document().view()->updateAllLifecyclePhasesExceptPaint();
     IntRect newInterestRect(0, 100, 300, 1000);
     bool needsCommit = paintWithoutCommit(&newInterestRect);
 
     // Container1 becomes partly in the interest rect, but uses cached subsequence
     // because it was fully painted before;
     // Container2's intersection with the interest rect changes;
     // Content2b is out of the interest rect and outputs nothing;
     // Container3 becomes out of the interest rect and outputs empty subsequence pair..
     EXPECT_DISPLAY_LIST(rootPaintController().newDisplayItemList(), 11,
         TestDisplayItem(layoutView(), cachedDocumentBackgroundType),
@@ skipping 30 matching lines @@
 
 TEST_P(PaintLayerPainterTest, CachedSubsequenceOnStyleChangeWithInterestRectClipping)
 {
     setBodyInnerHTML(
         "<div id='container1' style='position: relative; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
         "  <div id='content1' style='position: absolute; width: 100px; height: 100px; background-color: red'></div>"
         "</div>"
         "<div id='container2' style='position: relative; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
         "  <div id='content2' style='position: absolute; width: 100px; height: 100px; background-color: green'></div>"
         "</div>");
-    updateLifecyclePhasesBeforePaint();
+    document().view()->updateAllLifecyclePhasesExceptPaint();
     IntRect interestRect(0, 0, 50, 300); // PaintResult of all subsequences will be MayBeClippedByPaintDirtyRect.
     paint(&interestRect);
 
     PaintLayer& htmlLayer = *toLayoutBoxModelObject(document().documentElement()->layoutObject())->layer();
     LayoutObject& container1 = *document().getElementById("container1")->layoutObject();
     PaintLayer& container1Layer = *toLayoutBoxModelObject(container1).layer();
     LayoutObject& content1 = *document().getElementById("content1")->layoutObject();
     LayoutObject& container2 = *document().getElementById("container2")->layoutObject();
     PaintLayer& container2Layer = *toLayoutBoxModelObject(container2).layer();
     LayoutObject& content2 = *document().getElementById("content2")->layoutObject();
 
     EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 11,
         TestDisplayItem(layoutView(), documentBackgroundType),
         TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
         TestDisplayItem(container1Layer, DisplayItem::Subsequence),
         TestDisplayItem(container1, backgroundType),
         TestDisplayItem(content1, backgroundType),
         TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
         TestDisplayItem(container2Layer, DisplayItem::Subsequence),
         TestDisplayItem(container2, backgroundType),
         TestDisplayItem(content2, backgroundType),
         TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
         TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
 
     toHTMLElement(content1.node())->setAttribute(HTMLNames::styleAttr, "position: absolute; width: 100px; height: 100px; background-color: green");
-    updateLifecyclePhasesBeforePaint();
+    document().view()->updateAllLifecyclePhasesExceptPaint();
     bool needsCommit = paintWithoutCommit(&interestRect);
 
     EXPECT_DISPLAY_LIST(rootPaintController().newDisplayItemList(), 8,
         TestDisplayItem(layoutView(), cachedDocumentBackgroundType),
         TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
         TestDisplayItem(container1Layer, DisplayItem::Subsequence),
         TestDisplayItem(container1, cachedBackgroundType),
         TestDisplayItem(content1, backgroundType),
         TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
         TestDisplayItem(container2Layer, DisplayItem::CachedSubsequence),
@@ skipping 44 matching lines @@
 
     // Outline on the self-painting-layer node itself doesn't affect PaintPhaseDescendantOutlines.
     toHTMLElement(selfPaintingLayerObject.node())->setAttribute(HTMLNames::styleAttr, "position: absolute; outline: 1px solid green");
     document().view()->updateAllLifecyclePhases();
     EXPECT_FALSE(selfPaintingLayer.needsPaintPhaseDescendantOutlines());
     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);
-    updateLifecyclePhasesBeforePaint();
+    document().view()->updateAllLifecyclePhasesExceptPaint();
     EXPECT_TRUE(selfPaintingLayer.needsPaintPhaseDescendantOutlines());
     EXPECT_FALSE(nonSelfPaintingLayer.needsPaintPhaseDescendantOutlines());
     paint();
     EXPECT_TRUE(displayItemListContains(rootPaintController().getDisplayItemList(), outlineDiv, DisplayItem::paintPhaseToDrawingType(PaintPhaseSelfOutlineOnly)));
 }
 
 TEST_P(PaintLayerPainterTest, PaintPhaseFloat)
 {
     AtomicString styleWithoutFloat = "width: 50px; height: 50px; background-color: green";
     AtomicString styleWithFloat = "float: left; " + styleWithoutFloat;
@@ skipping 14 matching lines @@
     ASSERT_TRUE(selfPaintingLayer.isSelfPaintingLayer());
     PaintLayer& nonSelfPaintingLayer = *toLayoutBoxModelObject(document().getElementById("non-self-painting-layer")->layoutObject())->layer();
     ASSERT_FALSE(nonSelfPaintingLayer.isSelfPaintingLayer());
     ASSERT_TRUE(&nonSelfPaintingLayer == floatDiv.enclosingLayer());
 
     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);
-    updateLifecyclePhasesBeforePaint();
+    document().view()->updateAllLifecyclePhasesExceptPaint();
     EXPECT_TRUE(selfPaintingLayer.needsPaintPhaseFloat());
     EXPECT_FALSE(nonSelfPaintingLayer.needsPaintPhaseFloat());
     paint();
     EXPECT_TRUE(displayItemListContains(rootPaintController().getDisplayItemList(), floatDiv, DisplayItem::BoxDecorationBackground));
 }
 
 TEST_P(PaintLayerPainterTest, PaintPhaseBlockBackground)
 {
     AtomicString styleWithoutBackground = "width: 50px; height: 50px";
     AtomicString styleWithBackground = "background: blue; " + styleWithoutBackground;
@@ skipping 21 matching lines @@
 
     // Background on the self-painting-layer node itself doesn't affect PaintPhaseDescendantBlockBackgrounds.
     toHTMLElement(selfPaintingLayerObject.node())->setAttribute(HTMLNames::styleAttr, "position: absolute; background: green");
     document().view()->updateAllLifecyclePhases();
     EXPECT_FALSE(selfPaintingLayer.needsPaintPhaseDescendantBlockBackgrounds());
     EXPECT_FALSE(nonSelfPaintingLayer.needsPaintPhaseDescendantBlockBackgrounds());
     EXPECT_TRUE(displayItemListContains(rootPaintController().getDisplayItemList(), selfPaintingLayerObject, DisplayItem::BoxDecorationBackground));
 
     // needsPaintPhaseDescendantBlockBackgrounds should be set when any descendant on the same layer has Background.
     toHTMLElement(backgroundDiv.node())->setAttribute(HTMLNames::styleAttr, styleWithBackground);
-    updateLifecyclePhasesBeforePaint();
+    document().view()->updateAllLifecyclePhasesExceptPaint();
     EXPECT_TRUE(selfPaintingLayer.needsPaintPhaseDescendantBlockBackgrounds());
     EXPECT_FALSE(nonSelfPaintingLayer.needsPaintPhaseDescendantBlockBackgrounds());
     paint();
     EXPECT_TRUE(displayItemListContains(rootPaintController().getDisplayItemList(), backgroundDiv, DisplayItem::BoxDecorationBackground));
 }
 
 TEST_P(PaintLayerPainterTest, PaintPhasesUpdateOnLayerRemoval)
 {
     setBodyInnerHTML(
         "<div id='layer' style='position: relative'>"
@@ skipping 46 matching lines @@
     document().view()->updateAllLifecyclePhases();
     ASSERT_TRUE(layerDiv.hasLayer());
     PaintLayer& layer = *layerDiv.layer();
     ASSERT_TRUE(layer.isSelfPaintingLayer());
     EXPECT_TRUE(layer.needsPaintPhaseDescendantOutlines());
     EXPECT_TRUE(layer.needsPaintPhaseFloat());
     EXPECT_TRUE(layer.needsPaintPhaseDescendantBlockBackgrounds());
 }
 
 } // namespace blink