Improvement handling of background and outline paint phases

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

 // Copyright 2014 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/paint/LayoutObjectDrawingRecorder.h"
 
 #include "core/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/PaintControllerPaintTest.h"
 #include "core/paint/PaintLayer.h"
@@ skipping 47 matching lines @@
     rootPaintController().commitNewDisplayItems();
     EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 1,
         TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
 }
 
 TEST_F(LayoutObjectDrawingRecorderTest, Cached)
 {
     rootPaintController().invalidateAll();
     GraphicsContext context(rootPaintController());
     LayoutRect bound = layoutView().viewRect();
-    drawNothing(context, layoutView(), PaintPhaseSelfBlockBackground, bound);
+    drawNothing(context, layoutView(), PaintPhaseSelfBlockBackgroundOnly, bound);
     drawRect(context, layoutView(), PaintPhaseForeground, bound);
     rootPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 2,
-        TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseSelfBlockBackground)),
+        TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseSelfBlockBackgroundOnly)),
         TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
 
-    drawNothing(context, layoutView(), PaintPhaseSelfBlockBackground, bound);
+    drawNothing(context, layoutView(), PaintPhaseSelfBlockBackgroundOnly, bound);
     drawRect(context, layoutView(), PaintPhaseForeground, bound);
 
     EXPECT_DISPLAY_LIST(rootPaintController().newDisplayItemList(), 2,
-        TestDisplayItem(layoutView(), DisplayItem::drawingTypeToCachedDrawingType(DisplayItem::paintPhaseToDrawingType(PaintPhaseSelfBlockBackground))),
+        TestDisplayItem(layoutView(), DisplayItem::drawingTypeToCachedDrawingType(DisplayItem::paintPhaseToDrawingType(PaintPhaseSelfBlockBackgroundOnly))),
         TestDisplayItem(layoutView(), DisplayItem::drawingTypeToCachedDrawingType(DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground))));
 
     rootPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 2,
-        TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseSelfBlockBackground)),
+        TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseSelfBlockBackgroundOnly)),
         TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
 }
 
 template <typename T>
 FloatRect drawAndGetCullRect(PaintController& controller, const LayoutObject& layoutObject, const T& bounds)
 {
     controller.invalidateAll();
     {
         // Draw some things which will produce a non-null picture.
         GraphicsContext context(controller);
@@ skipping 61 matching lines @@
 
     // Ensure the new paint offset can be used.
     EXPECT_TRUE(LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(context, layoutView(), PaintPhaseForeground, newPaintOffset));
     rootPaintController().commitNewDisplayItems();
     EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 1,
         TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
 }
 
 } // namespace
 } // namespace blink