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

Commit 05f1d5c0 authored by Mike Reed's avatar Mike Reed
Browse files

remove overrides of onDrawText -- no longer called 

Skia now routes drawText, drawPosText, drawPosTextH to textblobs, so
these virtuals are no longer needed/called.

Test: make

Change-Id: Ia9d98d6c4ac72cea4ed9ed938b5fd29dbfe8bf49
parent b1910c47

libs/hwui/RecordingCanvas.cpp

+0 −12
Original line number Diff line number Diff line
@@ -912,18 +912,6 @@ void RecordingCanvas::onDrawAnnotation(const SkRect& rect, const char key[], SkD 
    fDL->drawAnnotation(rect, key, val);

}



void RecordingCanvas::onDrawText(const void* text, size_t bytes, SkScalar x, SkScalar y,

                                 const SkPaint& paint) {

    fDL->drawText(text, bytes, x, y, paint);

}

void RecordingCanvas::onDrawPosText(const void* text, size_t bytes, const SkPoint pos[],

                                    const SkPaint& paint) {

    fDL->drawPosText(text, bytes, pos, paint);

}

void RecordingCanvas::onDrawPosTextH(const void* text, size_t bytes, const SkScalar xs[],

                                     SkScalar y, const SkPaint& paint) {

    fDL->drawPosTextH(text, bytes, xs, y, paint);

}

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

libs/hwui/RecordingCanvas.h

+0 −4
Original line number Diff line number Diff line
@@ -170,10 +170,6 @@ public: 
    void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;

    void onDrawAnnotation(const SkRect&, const char[], SkData*) override;



    void onDrawText(const void*, size_t, SkScalar x, SkScalar y, const SkPaint&) override;

    void onDrawPosText(const void*, size_t, const SkPoint[], const SkPaint&) override;

    void onDrawPosTextH(const void*, size_t, const SkScalar[], SkScalar, const SkPaint&) override;



    void onDrawTextRSXform(const void*, size_t, const SkRSXform[], const SkRect*,

                           const SkPaint&) override;

    void onDrawTextBlob(const SkTextBlob*, SkScalar, SkScalar, const SkPaint&) override;

libs/hwui/pipeline/skia/DumpOpsCanvas.h

+0 −12
Original line number Diff line number Diff line
@@ -82,18 +82,6 @@ protected: 
        mOutput << mIdent << "drawDRRect" << std::endl;

    }



    void onDrawText(const void*, size_t, SkScalar, SkScalar, const SkPaint&) override {

        mOutput << mIdent << "drawText" << std::endl;

    }



    void onDrawPosText(const void*, size_t, const SkPoint[], const SkPaint&) override {

        mOutput << mIdent << "drawPosText" << std::endl;

    }



    void onDrawPosTextH(const void*, size_t, const SkScalar[], SkScalar, const SkPaint&) override {

        mOutput << mIdent << "drawPosTextH" << std::endl;

    }



    void onDrawTextRSXform(const void*, size_t, const SkRSXform[], const SkRect*,

                           const SkPaint&) override {

        mOutput << mIdent << "drawTextRSXform" << std::endl;

libs/hwui/tests/unit/FatalTestCanvas.h

+0 −12
Original line number Diff line number Diff line
@@ -30,18 +30,6 @@ public: 
    void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) {

        ADD_FAILURE() << "onDrawDRRect not expected in this test";

    }

    void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,

                    const SkPaint& paint) {

        ADD_FAILURE() << "onDrawText not expected in this test";

    }

    void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],

                       const SkPaint& paint) {

        ADD_FAILURE() << "onDrawPosText not expected in this test";

    }

    void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], SkScalar constY,

                        const SkPaint& paint) {

        ADD_FAILURE() << "onDrawPosTextH 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";