diff options
| -rw-r--r-- | libs/hwui/pipeline/skia/DumpOpsCanvas.h | 5 | ||||
| -rw-r--r-- | libs/hwui/tests/common/CallCountingCanvas.h | 6 | ||||
| -rw-r--r-- | libs/hwui/tests/unit/CanvasOpTests.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/tests/unit/FatalTestCanvas.h | 4 | ||||
| -rw-r--r-- | libs/hwui/tests/unit/RenderNodeDrawableTests.cpp | 5 | ||||
| -rw-r--r-- | libs/hwui/tests/unit/SkiaPipelineTests.cpp | 10 |
6 files changed, 10 insertions, 22 deletions
diff --git a/libs/hwui/pipeline/skia/DumpOpsCanvas.h b/libs/hwui/pipeline/skia/DumpOpsCanvas.h index 6a052dbb7cea..260547cda1c2 100644 --- a/libs/hwui/pipeline/skia/DumpOpsCanvas.h +++ b/libs/hwui/pipeline/skia/DumpOpsCanvas.h @@ -90,11 +90,6 @@ protected: mOutput << mIdent << "drawTextBlob" << std::endl; } - void onDrawImage2(const SkImage*, SkScalar dx, SkScalar dy, const SkSamplingOptions&, - const SkPaint*) override { - mOutput << mIdent << "drawImage" << std::endl; - } - void onDrawImageRect2(const SkImage*, const SkRect&, const SkRect&, const SkSamplingOptions&, const SkPaint*, SrcRectConstraint) override { mOutput << mIdent << "drawImageRect" << std::endl; diff --git a/libs/hwui/tests/common/CallCountingCanvas.h b/libs/hwui/tests/common/CallCountingCanvas.h index dc36a2e01815..df5f04f9904e 100644 --- a/libs/hwui/tests/common/CallCountingCanvas.h +++ b/libs/hwui/tests/common/CallCountingCanvas.h @@ -109,12 +109,6 @@ public: drawPoints++; } - int drawImageCount = 0; - void onDrawImage2(const SkImage* image, SkScalar dx, SkScalar dy, const SkSamplingOptions&, - const SkPaint* paint) override { - drawImageCount++; - } - int drawImageRectCount = 0; void onDrawImageRect2(const SkImage*, const SkRect&, const SkRect&, const SkSamplingOptions&, const SkPaint*, SkCanvas::SrcRectConstraint) override { diff --git a/libs/hwui/tests/unit/CanvasOpTests.cpp b/libs/hwui/tests/unit/CanvasOpTests.cpp index 18c50472a7df..4ae76e2f1fd2 100644 --- a/libs/hwui/tests/unit/CanvasOpTests.cpp +++ b/libs/hwui/tests/unit/CanvasOpTests.cpp @@ -492,7 +492,7 @@ TEST(CanvasOp, simpleDrawImage) { CallCountingCanvas canvas; EXPECT_EQ(0, canvas.sumTotalDrawCalls()); rasterizeCanvasBuffer(buffer, &canvas); - EXPECT_EQ(1, canvas.drawImageCount); + EXPECT_EQ(1, canvas.drawImageRectCount); EXPECT_EQ(1, canvas.sumTotalDrawCalls()); } diff --git a/libs/hwui/tests/unit/FatalTestCanvas.h b/libs/hwui/tests/unit/FatalTestCanvas.h index 96a0c6114682..8b95e0cd267d 100644 --- a/libs/hwui/tests/unit/FatalTestCanvas.h +++ b/libs/hwui/tests/unit/FatalTestCanvas.h @@ -69,10 +69,6 @@ public: void onDrawPath(const SkPath&, const SkPaint&) { ADD_FAILURE() << "onDrawPath not expected in this test"; } - void onDrawImage2(const SkImage*, SkScalar dx, SkScalar dy, const SkSamplingOptions&, - const SkPaint*) { - ADD_FAILURE() << "onDrawImage not expected in this test"; - } void onDrawImageRect2(const SkImage*, const SkRect&, const SkRect&, const SkSamplingOptions&, const SkPaint*, SrcRectConstraint) { ADD_FAILURE() << "onDrawImageRect not expected in this test"; diff --git a/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp b/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp index 073a8357e574..ca540874833c 100644 --- a/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp +++ b/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp @@ -941,8 +941,9 @@ RENDERTHREAD_TEST(RenderNodeDrawable, simple) { void onDrawRect(const SkRect& rect, const SkPaint& paint) override { EXPECT_EQ(0, mDrawCounter++); } - void onDrawImage2(const SkImage*, SkScalar dx, SkScalar dy, const SkSamplingOptions&, - const SkPaint*) override { + void onDrawImageRect2(const SkImage*, const SkRect&, const SkRect&, + const SkSamplingOptions&, const SkPaint*, + SrcRectConstraint) override { EXPECT_EQ(1, mDrawCounter++); } }; diff --git a/libs/hwui/tests/unit/SkiaPipelineTests.cpp b/libs/hwui/tests/unit/SkiaPipelineTests.cpp index 3ded540c3152..785e2869d15e 100644 --- a/libs/hwui/tests/unit/SkiaPipelineTests.cpp +++ b/libs/hwui/tests/unit/SkiaPipelineTests.cpp @@ -303,8 +303,9 @@ RENDERTHREAD_TEST(SkiaPipeline, clipped) { class ClippedTestCanvas : public SkCanvas { public: ClippedTestCanvas() : SkCanvas(CANVAS_WIDTH, CANVAS_HEIGHT) {} - void onDrawImage2(const SkImage*, SkScalar dx, SkScalar dy, const SkSamplingOptions&, - const SkPaint*) override { + void onDrawImageRect2(const SkImage*, const SkRect&, const SkRect&, + const SkSamplingOptions&, const SkPaint*, + SrcRectConstraint) override { EXPECT_EQ(0, mDrawCounter++); EXPECT_EQ(SkRect::MakeLTRB(10, 20, 30, 40), TestUtils::getClipBounds(this)); EXPECT_TRUE(getTotalMatrix().isIdentity()); @@ -338,8 +339,9 @@ RENDERTHREAD_TEST(SkiaPipeline, clipped_rotated) { class ClippedTestCanvas : public SkCanvas { public: ClippedTestCanvas() : SkCanvas(CANVAS_WIDTH, CANVAS_HEIGHT) {} - void onDrawImage2(const SkImage*, SkScalar dx, SkScalar dy, const SkSamplingOptions&, - const SkPaint*) override { + void onDrawImageRect2(const SkImage*, const SkRect&, const SkRect&, + const SkSamplingOptions&, const SkPaint*, + SrcRectConstraint) override { EXPECT_EQ(0, mDrawCounter++); // Expect clip to be rotated. EXPECT_EQ(SkRect::MakeLTRB(CANVAS_HEIGHT - dirty.fTop - dirty.height(), dirty.fLeft, |