diff options
author | 2018-12-20 12:55:26 -0500 | |
---|---|---|
committer | 2018-12-21 09:33:49 -0500 | |
commit | 3682251dfd378cabee9d9540d14ac57434441ecd (patch) | |
tree | d3060213fceee6f2397567ca8d041a0e7494257b | |
parent | d21496879af51d6d074d3eaa828dbe1434eed1d8 (diff) |
remove overrides of (dead) onDrawTextRSXform
Test: make
Change-Id: Id943d36e76a837ec8e86de6f28e999a442cc489b
-rw-r--r-- | libs/hwui/RecordingCanvas.cpp | 4 | ||||
-rw-r--r-- | libs/hwui/RecordingCanvas.h | 2 | ||||
-rw-r--r-- | libs/hwui/pipeline/skia/DumpOpsCanvas.h | 5 | ||||
-rw-r--r-- | libs/hwui/tests/unit/FatalTestCanvas.h | 6 |
4 files changed, 1 insertions, 16 deletions
diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp index fc813d20b1ac..4de25f93c592 100644 --- a/libs/hwui/RecordingCanvas.cpp +++ b/libs/hwui/RecordingCanvas.cpp @@ -932,10 +932,6 @@ void RecordingCanvas::onDrawAnnotation(const SkRect& rect, const char key[], SkD fDL->drawAnnotation(rect, key, val); } -void RecordingCanvas::onDrawTextRSXform(const void* text, size_t bytes, const SkRSXform xform[], - const SkRect* cull, const SkPaint& paint) { - fDL->drawTextRSXform(text, bytes, xform, cull, paint); -} void RecordingCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, const SkPaint& paint) { fDL->drawTextBlob(blob, x, y, paint); diff --git a/libs/hwui/RecordingCanvas.h b/libs/hwui/RecordingCanvas.h index 22b3a63884ee..ae3c4f057c12 100644 --- a/libs/hwui/RecordingCanvas.h +++ b/libs/hwui/RecordingCanvas.h @@ -173,8 +173,6 @@ public: void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override; void onDrawAnnotation(const SkRect&, const char[], SkData*) override; - void onDrawTextRSXform(const void*, size_t, const SkRSXform[], const SkRect*, - const SkPaint&) override; void onDrawTextBlob(const SkTextBlob*, SkScalar, SkScalar, const SkPaint&) override; void onDrawBitmap(const SkBitmap&, SkScalar, SkScalar, const SkPaint*) override; diff --git a/libs/hwui/pipeline/skia/DumpOpsCanvas.h b/libs/hwui/pipeline/skia/DumpOpsCanvas.h index 2b5d58051c2c..0eb526af127a 100644 --- a/libs/hwui/pipeline/skia/DumpOpsCanvas.h +++ b/libs/hwui/pipeline/skia/DumpOpsCanvas.h @@ -82,11 +82,6 @@ protected: mOutput << mIdent << "drawDRRect" << std::endl; } - void onDrawTextRSXform(const void*, size_t, const SkRSXform[], const SkRect*, - const SkPaint&) override { - mOutput << mIdent << "drawTextRSXform" << std::endl; - } - void onDrawTextBlob(const SkTextBlob*, SkScalar, SkScalar, const SkPaint&) override { mOutput << mIdent << "drawTextBlob" << std::endl; } diff --git a/libs/hwui/tests/unit/FatalTestCanvas.h b/libs/hwui/tests/unit/FatalTestCanvas.h index 146662b1e913..1723c2eb4948 100644 --- a/libs/hwui/tests/unit/FatalTestCanvas.h +++ b/libs/hwui/tests/unit/FatalTestCanvas.h @@ -30,10 +30,6 @@ public: void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) { ADD_FAILURE() << "onDrawDRRect not expected in this test"; } - void onDrawTextRSXform(const void* text, size_t byteLength, const SkRSXform[], - const SkRect* cullRect, const SkPaint& paint) { - ADD_FAILURE() << "onDrawTextRSXform not expected in this test"; - } void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, const SkPaint& paint) { ADD_FAILURE() << "onDrawTextBlob not expected in this test"; } @@ -116,4 +112,4 @@ public: int mDrawCounter = 0; // counts how may draw calls of any kind were made to this canvas }; -}
\ No newline at end of file +} |