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/CanvasOpTests.cpp b/libs/hwui/tests/unit/CanvasOpTests.cpp
index 18c5047..4ae76e2 100644
--- a/libs/hwui/tests/unit/CanvasOpTests.cpp
+++ b/libs/hwui/tests/unit/CanvasOpTests.cpp
@@ -492,7 +492,7 @@
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());
}