commit 4efe0bed468b6c4e76d607579dc6e79c524cbe72
author Mike Reed <reed@google.com> Sun Jan 03 20:57:35 2021 -0500
committer Mike Reed <reed@google.com> Mon Jan 04 02:08:15 2021 +0000
tree 29bb2cb1b5f3d04ef21242c2fed32d511b736b93
parent 86e3bd8a07bdfacc887230f82d0caab76943275c

onDrawImageNine is no longer used

nine-patch draws now route through onDrawImageLattice, and canvas no
longer ever calls onDrawImageNine.

Test: make

Change-Id: Ie1d5b0c72690a4986e97efa1feeb736ef704a079

libs/hwui/tests/common/CallCountingCanvas.h

diff --git a/libs/hwui/tests/common/CallCountingCanvas.h b/libs/hwui/tests/common/CallCountingCanvas.h
index 594afd0..40b5747 100644
--- a/libs/hwui/tests/common/CallCountingCanvas.h
+++ b/libs/hwui/tests/common/CallCountingCanvas.h
@@ -119,12 +119,6 @@
         drawImageRectCount++;
     }
 
-    int drawImageNineCount = 0;
-    void onDrawImageNine(const SkImage* image, const SkIRect& center, const SkRect& dst,
-                         const SkPaint* paint) override {
-        drawImageNineCount++;
-    }
-
     int drawImageLatticeCount = 0;
     void onDrawImageLattice(const SkImage* image, const SkCanvas::Lattice& lattice,
                             const SkRect& dst, const SkPaint* paint) override {
@@ -171,4 +165,4 @@
 
 } /* namespace test */
 } /* namespace uirenderer */
-} /* namespace android */
\ No newline at end of file
+} /* namespace android */

libs/hwui/tests/unit/FatalTestCanvas.h

diff --git a/libs/hwui/tests/unit/FatalTestCanvas.h b/libs/hwui/tests/unit/FatalTestCanvas.h
index 76ae085..8467be9 100644
--- a/libs/hwui/tests/unit/FatalTestCanvas.h
+++ b/libs/hwui/tests/unit/FatalTestCanvas.h
@@ -74,9 +74,6 @@
                          SrcRectConstraint) {
         ADD_FAILURE() << "onDrawImageRect not expected in this test";
     }
-    void onDrawImageNine(const SkImage*, const SkIRect& center, const SkRect& dst, const SkPaint*) {
-        ADD_FAILURE() << "onDrawImageNine not expected in this test";
-    }
     void onDrawImageLattice(const SkImage*, const Lattice& lattice, const SkRect& dst,
                             const SkPaint*) {
         ADD_FAILURE() << "onDrawImageLattice not expected in this test";