| Index: third_party/WebKit/Source/platform/graphics/paint/PaintChunkTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintChunkTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintChunkTest.cpp
|
| index a8e3970af02fbb0d8f8d546c54a23cf3e64642e1..fa3f8295d12b90973a467ea1f7eeab5b179f0239 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/paint/PaintChunkTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/paint/PaintChunkTest.cpp
|
| @@ -16,7 +16,7 @@ TEST(PaintChunkTest, matchesSame)
|
| PaintChunkProperties properties;
|
| FakeDisplayItemClient client;
|
| client.updateCacheGeneration();
|
| - DisplayItem::Id id(client, DisplayItem::DrawingFirst);
|
| + DisplayItem::Id id(client, DisplayItem::kDrawingFirst);
|
| EXPECT_TRUE(PaintChunk(0, 1, &id, properties).matches(PaintChunk(0, 1, &id, properties)));
|
| }
|
|
|
| @@ -25,7 +25,7 @@ TEST(PaintChunkTest, matchesEqual)
|
| PaintChunkProperties properties;
|
| FakeDisplayItemClient client;
|
| client.updateCacheGeneration();
|
| - DisplayItem::Id id(client, DisplayItem::DrawingFirst);
|
| + DisplayItem::Id id(client, DisplayItem::kDrawingFirst);
|
| DisplayItem::Id idEqual = id;
|
| EXPECT_TRUE(PaintChunk(0, 1, &id, properties).matches(PaintChunk(0, 1, &idEqual, properties)));
|
| EXPECT_TRUE(PaintChunk(0, 1, &idEqual, properties).matches(PaintChunk(0, 1, &id, properties)));
|
| @@ -36,14 +36,14 @@ TEST(PaintChunkTest, IdNotMatches)
|
| PaintChunkProperties properties;
|
| FakeDisplayItemClient client1;
|
| client1.updateCacheGeneration();
|
| - DisplayItem::Id id1a(client1, DisplayItem::DrawingFirst);
|
| - DisplayItem::Id id1b(client1, DisplayItem::Subsequence);
|
| + DisplayItem::Id id1a(client1, DisplayItem::kDrawingFirst);
|
| + DisplayItem::Id id1b(client1, DisplayItem::kSubsequence);
|
| EXPECT_FALSE(PaintChunk(0, 1, &id1a, properties).matches(PaintChunk(0, 1, &id1b, properties)));
|
| EXPECT_FALSE(PaintChunk(0, 1, &id1b, properties).matches(PaintChunk(0, 1, &id1a, properties)));
|
|
|
| FakeDisplayItemClient client2;
|
| client2.updateCacheGeneration();
|
| - DisplayItem::Id id2(client2, DisplayItem::DrawingFirst);
|
| + DisplayItem::Id id2(client2, DisplayItem::kDrawingFirst);
|
| EXPECT_FALSE(PaintChunk(0, 1, &id1a, properties).matches(PaintChunk(0, 1, &id2, properties)));
|
| EXPECT_FALSE(PaintChunk(0, 1, &id2, properties).matches(PaintChunk(0, 1, &id1a, properties)));
|
| }
|
| @@ -53,7 +53,7 @@ TEST(PaintChunkTest, IdNotMatchesNull)
|
| PaintChunkProperties properties;
|
| FakeDisplayItemClient client;
|
| client.updateCacheGeneration();
|
| - DisplayItem::Id id(client, DisplayItem::DrawingFirst);
|
| + DisplayItem::Id id(client, DisplayItem::kDrawingFirst);
|
| EXPECT_FALSE(PaintChunk(0, 1, nullptr, properties).matches(PaintChunk(0, 1, &id, properties)));
|
| EXPECT_FALSE(PaintChunk(0, 1, &id, properties).matches(PaintChunk(0, 1, nullptr, properties)));
|
| EXPECT_FALSE(PaintChunk(0, 1, nullptr, properties).matches(PaintChunk(0, 1, nullptr, properties)));
|
| @@ -69,7 +69,7 @@ TEST(PaintChunkTest, IdNotMatchesJustCreated)
|
| client->setDisplayItemsUncached();
|
| EXPECT_TRUE(client->isJustCreated());
|
|
|
| - DisplayItem::Id id(*client, DisplayItem::DrawingFirst);
|
| + DisplayItem::Id id(*client, DisplayItem::kDrawingFirst);
|
| // A chunk of a newly created client doesn't match any chunk because it's never cached.
|
| EXPECT_FALSE(PaintChunk(0, 1, &id, properties).matches(PaintChunk(0, 1, &id, properties)));
|
|
|
|
|