| Index: third_party/WebKit/Source/platform/graphics/paint/PaintArtifactToSkCanvasTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintArtifactToSkCanvasTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintArtifactToSkCanvasTest.cpp
|
| index 8c6397d07e31f109c83b588a0acaefeebc1c74a5..24c592c0a78fec1b17cbd5cd9456b6d9f0686f5d 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/paint/PaintArtifactToSkCanvasTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/paint/PaintArtifactToSkCanvasTest.cpp
|
| @@ -126,9 +126,9 @@ TEST_F(PaintArtifactToSkCanvasTest, TransformCombining)
|
| RefPtr<TransformPaintPropertyNode> transform2 = TransformPaintPropertyNode::create(transform1, matrix2, FloatPoint3D());
|
|
|
| TestPaintArtifact artifact;
|
| - artifact.chunk(transform1.get(), nullptr, nullptr)
|
| + artifact.chunk(transform1.get(), nullptr, nullptr, nullptr)
|
| .rectDrawing(FloatRect(0, 0, 300, 200), SK_ColorRED);
|
| - artifact.chunk(transform2.get(), nullptr, nullptr)
|
| + artifact.chunk(transform2.get(), nullptr, nullptr, nullptr)
|
| .rectDrawing(FloatRect(0, 0, 300, 200), SK_ColorBLUE);
|
| paintArtifactToSkCanvas(artifact.build(), &canvas);
|
| }
|
| @@ -151,9 +151,9 @@ TEST_F(PaintArtifactToSkCanvasTest, OpacityEffectsCombining)
|
| RefPtr<EffectPaintPropertyNode> opacityEffect2 = EffectPaintPropertyNode::create(opacityEffect1, 0.25);
|
|
|
| TestPaintArtifact artifact;
|
| - artifact.chunk(nullptr, nullptr, opacityEffect1.get())
|
| + artifact.chunk(nullptr, nullptr, opacityEffect1.get(), nullptr)
|
| .rectDrawing(FloatRect(0, 0, 300, 200), SK_ColorRED);
|
| - artifact.chunk(nullptr, nullptr, opacityEffect2.get())
|
| + artifact.chunk(nullptr, nullptr, opacityEffect2.get(), nullptr)
|
| .rectDrawing(FloatRect(0, 0, 300, 200), SK_ColorBLUE);
|
| paintArtifactToSkCanvas(artifact.build(), &canvas);
|
| }
|
| @@ -189,9 +189,9 @@ TEST_F(PaintArtifactToSkCanvasTest, ChangingOpacityEffects)
|
| // Build a two-chunk artifact directly.
|
| // chunk1 references opacity node b, chunk2 references opacity node d.
|
| TestPaintArtifact artifact;
|
| - artifact.chunk(nullptr, nullptr, opacityEffectB.get())
|
| + artifact.chunk(nullptr, nullptr, opacityEffectB.get(), nullptr)
|
| .rectDrawing(FloatRect(0, 0, 300, 200), SK_ColorRED);
|
| - artifact.chunk(nullptr, nullptr, opacityEffectD.get())
|
| + artifact.chunk(nullptr, nullptr, opacityEffectD.get(), nullptr)
|
| .rectDrawing(FloatRect(0, 0, 300, 200), SK_ColorBLUE);
|
| paintArtifactToSkCanvas(artifact.build(), &canvas);
|
| }
|
| @@ -237,7 +237,7 @@ TEST_F(PaintArtifactToSkCanvasTest, ClipWithScrollEscaping)
|
| ResultOf(&getCanvasClipAsRegion, Eq(totalClip))));
|
|
|
| TestPaintArtifact artifact;
|
| - artifact.chunk(nullptr, clip2.get(), nullptr)
|
| + artifact.chunk(nullptr, clip2.get(), nullptr, nullptr)
|
| .rectDrawing(FloatRect(0, 0, 300, 200), SK_ColorRED);
|
| paintArtifactToSkCanvas(artifact.build(), &canvas);
|
| }
|
|
|