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

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

Issue 2793233002: Remove begin/end subseq. display items, and store on PaintController instead. (Closed)
Patch Set: none Created 3 years, 8 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/TablePainterTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/TablePainterTest.cpp b/third_party/WebKit/Source/core/paint/TablePainterTest.cpp
index 775d04c7078c001254c16b20e58baaf1bc5d8741..0457359a885e989624f4034f4fbed945ce1258ed 100644
--- a/third_party/WebKit/Source/core/paint/TablePainterTest.cpp
+++ b/third_party/WebKit/Source/core/paint/TablePainterTest.cpp
@@ -122,9 +122,6 @@ TEST_F(TablePainterTest, BackgroundInSelfPaintingRow) {
LayoutObject& cell1 = *getLayoutObjectByElementId("cell1");
LayoutObject& cell2 = *getLayoutObjectByElementId("cell2");
LayoutObject& row = *getLayoutObjectByElementId("row");
- PaintLayer& htmlLayer =
- *toLayoutBoxModelObject(document().documentElement()->layoutObject())
- ->layer();
rootPaintController().invalidateAll();
document().view()->updateAllLifecyclePhasesExceptPaint();
@@ -133,14 +130,12 @@ TEST_F(TablePainterTest, BackgroundInSelfPaintingRow) {
paint(&interestRect);
EXPECT_DISPLAY_LIST(
- rootPaintController().getDisplayItemList(), 7,
+ rootPaintController().getDisplayItemList(), 5,
TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
- TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
TestDisplayItem(row, DisplayItem::kBeginCompositing),
TestDisplayItem(row, DisplayItem::kBoxDecorationBackground),
TestDisplayItem(cell1, DisplayItem::kBoxDecorationBackground),
- TestDisplayItem(row, DisplayItem::kEndCompositing),
- TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+ TestDisplayItem(row, DisplayItem::kEndCompositing));
document().view()->updateAllLifecyclePhasesExceptPaint();
// Intersects the spacing only.
@@ -148,10 +143,8 @@ TEST_F(TablePainterTest, BackgroundInSelfPaintingRow) {
paint(&interestRect);
EXPECT_DISPLAY_LIST(
- rootPaintController().getDisplayItemList(), 3,
- TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
- TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+ rootPaintController().getDisplayItemList(), 1,
+ TestDisplayItem(layoutView, DisplayItem::kDocumentBackground));
document().view()->updateAllLifecyclePhasesExceptPaint();
// Intersects cell2 only.
@@ -159,14 +152,12 @@ TEST_F(TablePainterTest, BackgroundInSelfPaintingRow) {
paint(&interestRect);
EXPECT_DISPLAY_LIST(
- rootPaintController().getDisplayItemList(), 7,
+ rootPaintController().getDisplayItemList(), 5,
TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
- TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
TestDisplayItem(row, DisplayItem::kBeginCompositing),
TestDisplayItem(row, DisplayItem::kBoxDecorationBackground),
TestDisplayItem(cell2, DisplayItem::kBoxDecorationBackground),
- TestDisplayItem(row, DisplayItem::kEndCompositing),
- TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+ TestDisplayItem(row, DisplayItem::kEndCompositing));
}
TEST_F(TablePainterTest, CollapsedBorderAndOverflow) {
« no previous file with comments | « third_party/WebKit/Source/core/paint/PaintPropertyTreeUpdateTests.cpp ('k') | third_party/WebKit/Source/platform/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698