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

Commit ca1b3b83 authored by John Reck's avatar John Reck
Browse files

Cleanup 

Change-Id: I8a75e6e32a4cb02e3978503305b4cdce1727e89a
parent bc5ddd69

libs/hwui/DisplayListOp.h

+2 −2
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ public: 
    // default empty constructor for bounds, to be overridden in child constructor body

    DrawBoundedOp(const SkPaint* paint): DrawOp(paint) { }



    bool getLocalBounds(Rect& localBounds) {

    virtual bool getLocalBounds(Rect& localBounds) {

        localBounds.set(mLocalBounds);

        OpenGLRenderer::TextShadow textShadow;

        if (OpenGLRenderer::getTextShadow(mPaint, &textShadow)) {
@@ -1029,7 +1029,7 @@ public: 
    DrawStrokableOp(float left, float top, float right, float bottom, const SkPaint* paint)

            : DrawBoundedOp(left, top, right, bottom, paint) {};



    bool getLocalBounds(Rect& localBounds) {

    virtual bool getLocalBounds(Rect& localBounds) {

        localBounds.set(mLocalBounds);

        if (mPaint && mPaint->getStyle() != SkPaint::kFill_Style) {

            localBounds.outset(strokeWidthOutset());

libs/hwui/OpenGLRenderer.h

+0 −6
Original line number Diff line number Diff line
@@ -184,12 +184,6 @@ public: 
    virtual status_t drawRoundRect(float left, float top, float right, float bottom,

            float rx, float ry, const SkPaint* paint);

    virtual status_t drawCircle(float x, float y, float radius, const SkPaint* paint);

    virtual status_t drawCircle(CanvasPropertyPrimitive* x, CanvasPropertyPrimitive* y,

            CanvasPropertyPrimitive* radius, CanvasPropertyPaint* paint) {

        // TODO: Remove once android_view_GLES20Canvas uses DisplayListRenderer

        // directly

        return drawCircle(x->value, y->value, radius->value, &paint->value);

    }

    virtual status_t drawOval(float left, float top, float right, float bottom,

            const SkPaint* paint);

    virtual status_t drawArc(float left, float top, float right, float bottom,