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

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

Issue 2286843002: Rename DisplayItem::Type enum constants to Chromium style. (Closed)
Patch Set: Rebasing... Created 4 years, 4 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/TableCellPainterTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/TableCellPainterTest.cpp b/third_party/WebKit/Source/core/paint/TableCellPainterTest.cpp
index 60992b7e625f194fd84c31bd84b009851ad34231..7ae06a05e018e4839cbbfd7844aa581b60d4a8bf 100644
--- a/third_party/WebKit/Source/core/paint/TableCellPainterTest.cpp
+++ b/third_party/WebKit/Source/core/paint/TableCellPainterTest.cpp
@@ -32,16 +32,16 @@ TEST_F(TableCellPainterTest, Background)
paint(&interestRect);
EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 2,
- TestDisplayItem(layoutView, DisplayItem::DocumentBackground),
- TestDisplayItem(cell1, DisplayItem::TableCellBackgroundFromRow));
+ TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
+ TestDisplayItem(cell1, DisplayItem::kTableCellBackgroundFromRow));
document().view()->updateAllLifecyclePhasesExceptPaint();
interestRect = IntRect(0, 300, 200, 1000);
paint(&interestRect);
EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 2,
- TestDisplayItem(layoutView, DisplayItem::DocumentBackground),
- TestDisplayItem(cell2, DisplayItem::TableCellBackgroundFromRow));
+ TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
+ TestDisplayItem(cell2, DisplayItem::kTableCellBackgroundFromRow));
}
TEST_F(TableCellPainterTest, BackgroundWithCellSpacing)
@@ -69,9 +69,9 @@ TEST_F(TableCellPainterTest, BackgroundWithCellSpacing)
paint(&interestRect);
EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 3,
- TestDisplayItem(layoutView, DisplayItem::DocumentBackground),
- TestDisplayItem(cell1, DisplayItem::TableCellBackgroundFromRow),
- TestDisplayItem(cell1, DisplayItem::BoxDecorationBackground));
+ TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
+ TestDisplayItem(cell1, DisplayItem::kTableCellBackgroundFromRow),
+ TestDisplayItem(cell1, DisplayItem::kBoxDecorationBackground));
document().view()->updateAllLifecyclePhasesExceptPaint();
// Intersects the spacing only.
@@ -79,7 +79,7 @@ TEST_F(TableCellPainterTest, BackgroundWithCellSpacing)
paint(&interestRect);
EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 1,
- TestDisplayItem(layoutView, DisplayItem::DocumentBackground));
+ TestDisplayItem(layoutView, DisplayItem::kDocumentBackground));
document().view()->updateAllLifecyclePhasesExceptPaint();
// Intersects cell2 only.
@@ -87,9 +87,9 @@ TEST_F(TableCellPainterTest, BackgroundWithCellSpacing)
paint(&interestRect);
EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 3,
- TestDisplayItem(layoutView, DisplayItem::DocumentBackground),
- TestDisplayItem(cell2, DisplayItem::TableCellBackgroundFromRow),
- TestDisplayItem(cell2, DisplayItem::BoxDecorationBackground));
+ TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
+ TestDisplayItem(cell2, DisplayItem::kTableCellBackgroundFromRow),
+ TestDisplayItem(cell2, DisplayItem::kBoxDecorationBackground));
}
TEST_F(TableCellPainterTest, BackgroundInSelfPaintingRow)
@@ -118,13 +118,13 @@ TEST_F(TableCellPainterTest, BackgroundInSelfPaintingRow)
paint(&interestRect);
EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 7,
- TestDisplayItem(layoutView, DisplayItem::DocumentBackground),
- TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
- TestDisplayItem(row, DisplayItem::BeginCompositing),
- TestDisplayItem(cell1, DisplayItem::TableCellBackgroundFromRow),
- TestDisplayItem(cell1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(row, DisplayItem::EndCompositing),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
+ TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
+ TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+ TestDisplayItem(row, DisplayItem::kBeginCompositing),
+ TestDisplayItem(cell1, DisplayItem::kTableCellBackgroundFromRow),
+ TestDisplayItem(cell1, DisplayItem::kBoxDecorationBackground),
+ TestDisplayItem(row, DisplayItem::kEndCompositing),
+ TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
document().view()->updateAllLifecyclePhasesExceptPaint();
// Intersects the spacing only.
@@ -132,9 +132,9 @@ TEST_F(TableCellPainterTest, BackgroundInSelfPaintingRow)
paint(&interestRect);
EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 3,
- TestDisplayItem(layoutView, DisplayItem::DocumentBackground),
- TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
+ TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
+ TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
document().view()->updateAllLifecyclePhasesExceptPaint();
// Intersects cell2 only.
@@ -142,13 +142,13 @@ TEST_F(TableCellPainterTest, BackgroundInSelfPaintingRow)
paint(&interestRect);
EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 7,
- TestDisplayItem(layoutView, DisplayItem::DocumentBackground),
- TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
- TestDisplayItem(row, DisplayItem::BeginCompositing),
- TestDisplayItem(cell2, DisplayItem::TableCellBackgroundFromRow),
- TestDisplayItem(cell2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(row, DisplayItem::EndCompositing),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
+ TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
+ TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+ TestDisplayItem(row, DisplayItem::kBeginCompositing),
+ TestDisplayItem(cell2, DisplayItem::kTableCellBackgroundFromRow),
+ TestDisplayItem(cell2, DisplayItem::kBoxDecorationBackground),
+ TestDisplayItem(row, DisplayItem::kEndCompositing),
+ TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
}
TEST_F(TableCellPainterTest, CollapsedBorderAndOverflow)
@@ -174,9 +174,9 @@ TEST_F(TableCellPainterTest, CollapsedBorderAndOverflow)
// We should paint all display items of cell.
EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 4,
- TestDisplayItem(layoutView, DisplayItem::DocumentBackground),
- TestDisplayItem(cell, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(cell, DisplayItem::TableCollapsedBorderLast),
+ TestDisplayItem(layoutView, DisplayItem::kDocumentBackground),
+ TestDisplayItem(cell, DisplayItem::kBoxDecorationBackground),
+ TestDisplayItem(cell, DisplayItem::kTableCollapsedBorderLast),
TestDisplayItem(cell, DisplayItem::paintPhaseToDrawingType(PaintPhaseSelfOutlineOnly)));
}
« no previous file with comments | « third_party/WebKit/Source/core/paint/TableCellPainter.cpp ('k') | third_party/WebKit/Source/core/paint/TableRowPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698