Update tests and canvas subclasses to expect drawImageRect calls
As part of the the linked staging flag CL,
removing SK_RESOLVE_FILTERS_BEFORE_RESTORE has
SkCanvas::drawImage call into onDrawImageRect with a src rect
matching the image dimensions. onDrawImage() is no longer called
and will be removed from the SkCanvas API at a later point.
This removes all of the overrides that I could find in HWUI.
Bug: b/40042615
Change-Id: I4feea19d7622b217e0cf2c6fcc06f64e6427caa7
diff --git a/libs/hwui/tests/unit/SkiaPipelineTests.cpp b/libs/hwui/tests/unit/SkiaPipelineTests.cpp
index 3ded540..785e286 100644
--- a/libs/hwui/tests/unit/SkiaPipelineTests.cpp
+++ b/libs/hwui/tests/unit/SkiaPipelineTests.cpp
@@ -303,8 +303,9 @@
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 @@
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,