| Index: third_party/WebKit/Source/platform/graphics/paint/PaintChunkerTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintChunkerTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintChunkerTest.cpp
|
| index 0f55ae596b840d4495e13ba8cff0d75568932107..7a0d84156eba2c094584d29ced3bf59418de4288 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/paint/PaintChunkerTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/paint/PaintChunkerTest.cpp
|
| @@ -66,8 +66,9 @@ TEST_F(PaintChunkerTest, SingleNonEmptyRange) {
|
| chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
|
| Vector<PaintChunk> chunks = chunker.releasePaintChunks();
|
|
|
| - EXPECT_THAT(chunks, ElementsAre(PaintChunk(0, 2, nullptr,
|
| - defaultPaintChunkProperties())));
|
| + EXPECT_THAT(
|
| + chunks,
|
| + ElementsAre(PaintChunk(0, 2, nullptr, defaultPaintChunkProperties())));
|
| }
|
|
|
| TEST_F(PaintChunkerTest, SamePropertiesTwiceCombineIntoOneChunk) {
|
| @@ -81,8 +82,9 @@ TEST_F(PaintChunkerTest, SamePropertiesTwiceCombineIntoOneChunk) {
|
| chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
|
| Vector<PaintChunk> chunks = chunker.releasePaintChunks();
|
|
|
| - EXPECT_THAT(chunks, ElementsAre(PaintChunk(0, 3, nullptr,
|
| - defaultPaintChunkProperties())));
|
| + EXPECT_THAT(
|
| + chunks,
|
| + ElementsAre(PaintChunk(0, 3, nullptr, defaultPaintChunkProperties())));
|
| }
|
|
|
| TEST_F(PaintChunkerTest, CanRewindDisplayItemIndex) {
|
| @@ -95,8 +97,9 @@ TEST_F(PaintChunkerTest, CanRewindDisplayItemIndex) {
|
| chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
|
| Vector<PaintChunk> chunks = chunker.releasePaintChunks();
|
|
|
| - EXPECT_THAT(chunks, ElementsAre(PaintChunk(0, 2, nullptr,
|
| - defaultPaintChunkProperties())));
|
| + EXPECT_THAT(
|
| + chunks,
|
| + ElementsAre(PaintChunk(0, 2, nullptr, defaultPaintChunkProperties())));
|
| }
|
|
|
| TEST_F(PaintChunkerTest, BuildMultipleChunksWithSinglePropertyChanging) {
|
| @@ -127,10 +130,11 @@ TEST_F(PaintChunkerTest, BuildMultipleChunksWithSinglePropertyChanging) {
|
|
|
| Vector<PaintChunk> chunks = chunker.releasePaintChunks();
|
|
|
| - EXPECT_THAT(chunks, ElementsAre(PaintChunk(0, 2, nullptr,
|
| - defaultPaintChunkProperties()),
|
| - PaintChunk(2, 3, nullptr, simpleTransform),
|
| - PaintChunk(3, 4, nullptr, anotherTransform)));
|
| + EXPECT_THAT(
|
| + chunks,
|
| + ElementsAre(PaintChunk(0, 2, nullptr, defaultPaintChunkProperties()),
|
| + PaintChunk(2, 3, nullptr, simpleTransform),
|
| + PaintChunk(3, 4, nullptr, anotherTransform)));
|
| }
|
|
|
| TEST_F(PaintChunkerTest, BuildMultipleChunksWithDifferentPropertyChanges) {
|
| @@ -252,9 +256,10 @@ TEST_F(PaintChunkerTest, ChangingPropertiesWithoutItems) {
|
| chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
|
| Vector<PaintChunk> chunks = chunker.releasePaintChunks();
|
|
|
| - EXPECT_THAT(chunks, ElementsAre(PaintChunk(0, 1, nullptr,
|
| - defaultPaintChunkProperties()),
|
| - PaintChunk(1, 2, nullptr, secondTransform)));
|
| + EXPECT_THAT(
|
| + chunks,
|
| + ElementsAre(PaintChunk(0, 1, nullptr, defaultPaintChunkProperties()),
|
| + PaintChunk(1, 2, nullptr, secondTransform)));
|
| }
|
|
|
| TEST_F(PaintChunkerTest, CreatesSeparateChunksWhenRequested) {
|
|
|