Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3682251d authored by Mike Reed's avatar Mike Reed
Browse files

remove overrides of (dead) onDrawTextRSXform 

Test: make

Change-Id: Id943d36e76a837ec8e86de6f28e999a442cc489b
parent d2149687

libs/hwui/RecordingCanvas.cpp

+0 −4
Original line number Diff line number Diff line
@@ -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);

libs/hwui/RecordingCanvas.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

libs/hwui/pipeline/skia/DumpOpsCanvas.h

+0 −5
Original line number Diff line number Diff line
@@ -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;

    }

libs/hwui/tests/unit/FatalTestCanvas.h

+1 −5
Original line number Diff line number Diff line
@@ -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";

    }