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/RenderNodeDrawableTests.cpp b/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp
index 073a835..ca54087 100644
--- a/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp
+++ b/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp
@@ -941,8 +941,9 @@
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++);
}
};