| Index: third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp b/third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp
|
| index 92c7cf99ae0ffa1408d6e79bf5249f92fe2013a6..92e398f63c5d2860e5671c17341ca2c4f16724bf 100644
|
| --- a/third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp
|
| @@ -51,10 +51,10 @@ TEST_F(LayoutObjectDrawingRecorderTest, Nothing) {
|
| LayoutRect bound = layoutView().viewRect();
|
| drawNothing(context, layoutView(), PaintPhaseForeground, bound);
|
| rootPaintController().commitNewDisplayItems();
|
| - EXPECT_DISPLAY_LIST(
|
| - rootPaintController().getDisplayItemList(), 1,
|
| - TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(
|
| - PaintPhaseForeground)));
|
| + EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 1,
|
| + TestDisplayItem(layoutView(),
|
| + DisplayItem::paintPhaseToDrawingType(
|
| + PaintPhaseForeground)));
|
| EXPECT_FALSE(static_cast<const DrawingDisplayItem&>(
|
| rootPaintController().getDisplayItemList()[0])
|
| .GetPaintRecord());
|
| @@ -66,10 +66,10 @@ TEST_F(LayoutObjectDrawingRecorderTest, Rect) {
|
| LayoutRect bound = layoutView().viewRect();
|
| drawRect(context, layoutView(), PaintPhaseForeground, bound);
|
| rootPaintController().commitNewDisplayItems();
|
| - EXPECT_DISPLAY_LIST(
|
| - rootPaintController().getDisplayItemList(), 1,
|
| - TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(
|
| - PaintPhaseForeground)));
|
| + EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 1,
|
| + TestDisplayItem(layoutView(),
|
| + DisplayItem::paintPhaseToDrawingType(
|
| + PaintPhaseForeground)));
|
| }
|
|
|
| TEST_F(LayoutObjectDrawingRecorderTest, Cached) {
|
| @@ -80,12 +80,13 @@ TEST_F(LayoutObjectDrawingRecorderTest, Cached) {
|
| drawRect(context, layoutView(), PaintPhaseForeground, bound);
|
| rootPaintController().commitNewDisplayItems();
|
|
|
| - EXPECT_DISPLAY_LIST(
|
| - rootPaintController().getDisplayItemList(), 2,
|
| - TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(
|
| - PaintPhaseSelfBlockBackgroundOnly)),
|
| - TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(
|
| - PaintPhaseForeground)));
|
| + EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 2,
|
| + TestDisplayItem(layoutView(),
|
| + DisplayItem::paintPhaseToDrawingType(
|
| + PaintPhaseSelfBlockBackgroundOnly)),
|
| + TestDisplayItem(layoutView(),
|
| + DisplayItem::paintPhaseToDrawingType(
|
| + PaintPhaseForeground)));
|
|
|
| drawNothing(context, layoutView(), PaintPhaseSelfBlockBackgroundOnly, bound);
|
| drawRect(context, layoutView(), PaintPhaseForeground, bound);
|
| @@ -94,12 +95,13 @@ TEST_F(LayoutObjectDrawingRecorderTest, Cached) {
|
|
|
| rootPaintController().commitNewDisplayItems();
|
|
|
| - EXPECT_DISPLAY_LIST(
|
| - rootPaintController().getDisplayItemList(), 2,
|
| - TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(
|
| - PaintPhaseSelfBlockBackgroundOnly)),
|
| - TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(
|
| - PaintPhaseForeground)));
|
| + EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 2,
|
| + TestDisplayItem(layoutView(),
|
| + DisplayItem::paintPhaseToDrawingType(
|
| + PaintPhaseSelfBlockBackgroundOnly)),
|
| + TestDisplayItem(layoutView(),
|
| + DisplayItem::paintPhaseToDrawingType(
|
| + PaintPhaseForeground)));
|
| }
|
|
|
| template <typename T>
|
|
|