Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove overrides of (dead) onDrawTextRSXform

Browse Source 
Test: make

Change-Id: Id943d36e76a837ec8e86de6f28e999a442cc489b
This commit is contained in:
Mike Reed
2018-12-20 12:55:26 -05:00
parent d21496879a
commit 3682251dfd
4 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/RecordingCanvas.cpp
View File

@@ -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);

2
libs/hwui/RecordingCanvas.h
View File

@@ -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;

5
libs/hwui/pipeline/skia/DumpOpsCanvas.h
View File

@@ -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;
}

6
libs/hwui/tests/unit/FatalTestCanvas.h
View File

@@ -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
};
}
}