Index: third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp |
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp |
index ea86bf53753d275b5614908c0e561eae01a35ff3..726498cbe51dad9831271f880436e037cb90f426 100644 |
--- a/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp |
@@ -74,10 +74,10 @@ class TestDisplayItem final : public DisplayItem { |
}; |
#ifndef NDEBUG |
-#define TRACE_DISPLAY_ITEMS(i, expected, actual) \ |
- String trace = String::format("%d: ", (int)i) + "Expected: " + \ |
- (expected).asDebugString() + " Actual: " + \ |
- (actual).asDebugString(); \ |
+#define TRACE_DISPLAY_ITEMS(i, expected, actual) \ |
+ String trace = String::format("%d: ", (int)i) + \ |
+ "Expected: " + (expected).asDebugString() + \ |
+ " Actual: " + (actual).asDebugString(); \ |
SCOPED_TRACE(trace.utf8().data()); |
#else |
#define TRACE_DISPLAY_ITEMS(i, expected, actual) |
@@ -825,9 +825,10 @@ TEST_P(PaintControllerTest, CachedDisplayItems) { |
TestDisplayItem(first, backgroundDrawingType), |
TestDisplayItem(second, backgroundDrawingType)); |
// The first display item should be updated. |
- EXPECT_NE(firstPaintRecord, static_cast<const DrawingDisplayItem&>( |
- getPaintController().getDisplayItemList()[0]) |
- .GetPaintRecord()); |
+ EXPECT_NE(firstPaintRecord, |
+ static_cast<const DrawingDisplayItem&>( |
+ getPaintController().getDisplayItemList()[0]) |
+ .GetPaintRecord()); |
// The second display item should be cached. |
if (!RuntimeEnabledFeatures::paintUnderInvalidationCheckingEnabled()) { |
EXPECT_EQ(secondPaintRecord, |
@@ -1634,12 +1635,14 @@ TEST_P(PaintControllerTest, SkipCache) { |
TestDisplayItem(multicol, backgroundDrawingType), |
TestDisplayItem(content, foregroundDrawingType), |
TestDisplayItem(content, foregroundDrawingType)); |
- EXPECT_NE(record1.get(), static_cast<const DrawingDisplayItem&>( |
- getPaintController().getDisplayItemList()[1]) |
- .GetPaintRecord()); |
- EXPECT_NE(record2.get(), static_cast<const DrawingDisplayItem&>( |
- getPaintController().getDisplayItemList()[2]) |
- .GetPaintRecord()); |
+ EXPECT_NE(record1.get(), |
+ static_cast<const DrawingDisplayItem&>( |
+ getPaintController().getDisplayItemList()[1]) |
+ .GetPaintRecord()); |
+ EXPECT_NE(record2.get(), |
+ static_cast<const DrawingDisplayItem&>( |
+ getPaintController().getDisplayItemList()[2]) |
+ .GetPaintRecord()); |
if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
EXPECT_EQ(1u, getPaintController().paintChunks().size()); |
@@ -1670,12 +1673,14 @@ TEST_P(PaintControllerTest, SkipCache) { |
TestDisplayItem(content, foregroundDrawingType), |
TestDisplayItem(content, foregroundDrawingType), |
TestDisplayItem(content, foregroundDrawingType)); |
- EXPECT_NE(record1.get(), static_cast<const DrawingDisplayItem&>( |
- getPaintController().newDisplayItemList()[1]) |
- .GetPaintRecord()); |
- EXPECT_NE(record2.get(), static_cast<const DrawingDisplayItem&>( |
- getPaintController().newDisplayItemList()[2]) |
- .GetPaintRecord()); |
+ EXPECT_NE(record1.get(), |
+ static_cast<const DrawingDisplayItem&>( |
+ getPaintController().newDisplayItemList()[1]) |
+ .GetPaintRecord()); |
+ EXPECT_NE(record2.get(), |
+ static_cast<const DrawingDisplayItem&>( |
+ getPaintController().newDisplayItemList()[2]) |
+ .GetPaintRecord()); |
getPaintController().commitNewDisplayItems(); |
@@ -1757,15 +1762,18 @@ TEST_P(PaintControllerTest, PartialSkipCache) { |
TestDisplayItem(content, backgroundDrawingType), |
TestDisplayItem(content, foregroundDrawingType), |
TestDisplayItem(content, foregroundDrawingType)); |
- EXPECT_NE(record0.get(), static_cast<const DrawingDisplayItem&>( |
- getPaintController().getDisplayItemList()[0]) |
- .GetPaintRecord()); |
- EXPECT_NE(record1.get(), static_cast<const DrawingDisplayItem&>( |
- getPaintController().getDisplayItemList()[1]) |
- .GetPaintRecord()); |
- EXPECT_NE(record2.get(), static_cast<const DrawingDisplayItem&>( |
- getPaintController().getDisplayItemList()[2]) |
- .GetPaintRecord()); |
+ EXPECT_NE(record0.get(), |
+ static_cast<const DrawingDisplayItem&>( |
+ getPaintController().getDisplayItemList()[0]) |
+ .GetPaintRecord()); |
+ EXPECT_NE(record1.get(), |
+ static_cast<const DrawingDisplayItem&>( |
+ getPaintController().getDisplayItemList()[1]) |
+ .GetPaintRecord()); |
+ EXPECT_NE(record2.get(), |
+ static_cast<const DrawingDisplayItem&>( |
+ getPaintController().getDisplayItemList()[2]) |
+ .GetPaintRecord()); |
} |
TEST_F(PaintControllerTestBase, OptimizeNoopPairs) { |