Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(816)

Unified Diff: third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 f71616ff5ffe6885e6dc4472261998002e00519a..5bd3b814d9b253e1e3e03289ec605731cdbe02de 100644
--- a/third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp
+++ b/third_party/WebKit/Source/core/paint/LayoutObjectDrawingRecorderTest.cpp
@@ -44,9 +44,9 @@ TEST_F(LayoutObjectDrawingRecorderTest, Nothing)
LayoutRect bound = layoutView().viewRect();
drawNothing(context, layoutView(), PaintPhaseForeground, bound);
rootPaintController().commitNewDisplayItems();
- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 1,
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 1,
TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
- EXPECT_FALSE(static_cast<const DrawingDisplayItem&>(rootPaintController().displayItemList()[0]).picture());
+ EXPECT_FALSE(static_cast<const DrawingDisplayItem&>(rootPaintController().getDisplayItemList()[0]).picture());
}
TEST_F(LayoutObjectDrawingRecorderTest, Rect)
@@ -56,7 +56,7 @@ TEST_F(LayoutObjectDrawingRecorderTest, Rect)
LayoutRect bound = layoutView().viewRect();
drawRect(context, layoutView(), PaintPhaseForeground, bound);
rootPaintController().commitNewDisplayItems();
- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 1,
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 1,
TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
}
@@ -69,7 +69,7 @@ TEST_F(LayoutObjectDrawingRecorderTest, Cached)
drawRect(context, layoutView(), PaintPhaseForeground, bound);
rootPaintController().commitNewDisplayItems();
- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 2,
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 2,
TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseSelfBlockBackgroundOnly)),
TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
@@ -82,7 +82,7 @@ TEST_F(LayoutObjectDrawingRecorderTest, Cached)
rootPaintController().commitNewDisplayItems();
- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 2,
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 2,
TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseSelfBlockBackgroundOnly)),
TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
}
@@ -98,7 +98,7 @@ FloatRect drawAndGetCullRect(PaintController& controller, const LayoutObject& la
context.drawRect(enclosedIntRect(FloatRect(bounds)));
}
controller.commitNewDisplayItems();
- const auto& drawing = static_cast<const DrawingDisplayItem&>(controller.displayItemList()[0]);
+ const auto& drawing = static_cast<const DrawingDisplayItem&>(controller.getDisplayItemList()[0]);
return drawing.picture()->cullRect();
}
@@ -135,7 +135,7 @@ TEST_F(LayoutObjectDrawingRecorderTest, PaintOffsetCache)
}
rootPaintController().commitNewDisplayItems();
- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 1,
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 1,
TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
// Ensure we cannot use the cache with a new paint offset.
@@ -150,7 +150,7 @@ TEST_F(LayoutObjectDrawingRecorderTest, PaintOffsetCache)
}
rootPaintController().commitNewDisplayItems();
- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 1,
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 1,
TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
// Ensure the old paint offset cannot be used.
@@ -159,7 +159,7 @@ TEST_F(LayoutObjectDrawingRecorderTest, PaintOffsetCache)
// Ensure the new paint offset can be used.
EXPECT_TRUE(LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(context, layoutView(), PaintPhaseForeground));
rootPaintController().commitNewDisplayItems();
- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 1,
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 1,
TestDisplayItem(layoutView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
}
#endif

Powered by Google App Engine
This is Rietveld 408576698