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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/paint/PaintLayerPainterTest.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
« no previous file with comments | « third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp ('k') | third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp b/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp
index a1fb8fe34dd92b35bd743295d91a70648e7c18ac..b7f4bbf5360885993e32400844c53bf5372d60fe 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp
@@ -39,7 +39,7 @@ TEST_P(PaintLayerPainterTest, CachedSubsequence)
PaintLayer& container2Layer = *toLayoutBoxModelObject(container2).layer();
LayoutObject& content2 = *document().getElementById("content2")->layoutObject();
- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 11,
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 11,
TestDisplayItem(layoutView(), documentBackgroundType),
TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
TestDisplayItem(container1Layer, DisplayItem::Subsequence),
@@ -69,7 +69,7 @@ TEST_P(PaintLayerPainterTest, CachedSubsequence)
if (needsCommit)
commit();
- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 11,
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 11,
TestDisplayItem(layoutView(), documentBackgroundType),
TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
TestDisplayItem(container1Layer, DisplayItem::Subsequence),
@@ -118,7 +118,7 @@ TEST_P(PaintLayerPainterTest, CachedSubsequenceOnInterestRectChange)
// 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().displayItemList(), 15,
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 15,
TestDisplayItem(layoutView(), documentBackgroundType),
TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
TestDisplayItem(container1Layer, DisplayItem::Subsequence),
@@ -160,7 +160,7 @@ TEST_P(PaintLayerPainterTest, CachedSubsequenceOnInterestRectChange)
if (needsCommit)
commit();
- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 14,
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 14,
TestDisplayItem(layoutView(), documentBackgroundType),
TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
TestDisplayItem(container1Layer, DisplayItem::Subsequence),
@@ -198,7 +198,7 @@ TEST_P(PaintLayerPainterTest, CachedSubsequenceOnStyleChangeWithInterestRectClip
PaintLayer& container2Layer = *toLayoutBoxModelObject(container2).layer();
LayoutObject& content2 = *document().getElementById("content2")->layoutObject();
- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 11,
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 11,
TestDisplayItem(layoutView(), documentBackgroundType),
TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
TestDisplayItem(container1Layer, DisplayItem::Subsequence),
@@ -228,7 +228,7 @@ TEST_P(PaintLayerPainterTest, CachedSubsequenceOnStyleChangeWithInterestRectClip
if (needsCommit)
commit();
- EXPECT_DISPLAY_LIST(rootPaintController().displayItemList(), 11,
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 11,
TestDisplayItem(layoutView(), documentBackgroundType),
TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
TestDisplayItem(container1Layer, DisplayItem::Subsequence),
@@ -273,7 +273,7 @@ TEST_P(PaintLayerPainterTest, PaintPhaseOutline)
document().view()->updateAllLifecyclePhases();
EXPECT_FALSE(selfPaintingLayer.needsPaintPhaseDescendantOutlines());
EXPECT_FALSE(nonSelfPaintingLayer.needsPaintPhaseDescendantOutlines());
- EXPECT_TRUE(displayItemListContains(rootPaintController().displayItemList(), selfPaintingLayerObject, DisplayItem::paintPhaseToDrawingType(PaintPhaseSelfOutlineOnly)));
+ 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);
@@ -281,7 +281,7 @@ TEST_P(PaintLayerPainterTest, PaintPhaseOutline)
EXPECT_TRUE(selfPaintingLayer.needsPaintPhaseDescendantOutlines());
EXPECT_FALSE(nonSelfPaintingLayer.needsPaintPhaseDescendantOutlines());
paint();
- EXPECT_TRUE(displayItemListContains(rootPaintController().displayItemList(), outlineDiv, DisplayItem::paintPhaseToDrawingType(PaintPhaseSelfOutlineOnly)));
+ EXPECT_TRUE(displayItemListContains(rootPaintController().getDisplayItemList(), outlineDiv, DisplayItem::paintPhaseToDrawingType(PaintPhaseSelfOutlineOnly)));
}
TEST_P(PaintLayerPainterTest, PaintPhaseFloat)
@@ -316,7 +316,7 @@ TEST_P(PaintLayerPainterTest, PaintPhaseFloat)
EXPECT_TRUE(selfPaintingLayer.needsPaintPhaseFloat());
EXPECT_FALSE(nonSelfPaintingLayer.needsPaintPhaseFloat());
paint();
- EXPECT_TRUE(displayItemListContains(rootPaintController().displayItemList(), floatDiv, DisplayItem::BoxDecorationBackground));
+ EXPECT_TRUE(displayItemListContains(rootPaintController().getDisplayItemList(), floatDiv, DisplayItem::BoxDecorationBackground));
}
TEST_P(PaintLayerPainterTest, PaintPhaseBlockBackground)
@@ -350,7 +350,7 @@ TEST_P(PaintLayerPainterTest, PaintPhaseBlockBackground)
document().view()->updateAllLifecyclePhases();
EXPECT_FALSE(selfPaintingLayer.needsPaintPhaseDescendantBlockBackgrounds());
EXPECT_FALSE(nonSelfPaintingLayer.needsPaintPhaseDescendantBlockBackgrounds());
- EXPECT_TRUE(displayItemListContains(rootPaintController().displayItemList(), selfPaintingLayerObject, DisplayItem::BoxDecorationBackground));
+ 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);
@@ -358,7 +358,7 @@ TEST_P(PaintLayerPainterTest, PaintPhaseBlockBackground)
EXPECT_TRUE(selfPaintingLayer.needsPaintPhaseDescendantBlockBackgrounds());
EXPECT_FALSE(nonSelfPaintingLayer.needsPaintPhaseDescendantBlockBackgrounds());
paint();
- EXPECT_TRUE(displayItemListContains(rootPaintController().displayItemList(), backgroundDiv, DisplayItem::BoxDecorationBackground));
+ EXPECT_TRUE(displayItemListContains(rootPaintController().getDisplayItemList(), backgroundDiv, DisplayItem::BoxDecorationBackground));
}
TEST_P(PaintLayerPainterTest, PaintPhasesUpdateOnLayerRemoval)
« no previous file with comments | « third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp ('k') | third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698