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

Commit 4f641d1e authored by Tony Mantler's avatar Tony Mantler
Browse files

Revert "Change behavior of setBitmap to cleanly reset the canvas - identity... 

Revert "Change behavior of setBitmap to cleanly reset the canvas - identity matrix - no save stack - wide-open clip"

https://buganizer.corp.google.com/issues/36218535

This reverts commit 269f989f.

Change-Id: Ib2473e4fce90c9abaa39eea2b77082ae26197b80
parent 269f989f

graphics/java/android/graphics/Canvas.java

+2 −4
Original line number Diff line number Diff line
@@ -157,12 +157,10 @@ public class Canvas extends BaseCanvas { 


    /**

     * Specify a bitmap for the canvas to draw into. All canvas state such as

     * layers, filters, and the save/restore stack are reset. Additionally,

     * layers, filters, and the save/restore stack are reset with the exception

     * of the current matrix and clip stack. Additionally, as a side-effect

     * the canvas' target density is updated to match that of the bitmap.

     *

     * Prior to API level {@value Build.VERSION_CODES#O} the current matrix and

     * clip stack were preserved.

     *

     * @param bitmap Specifies a mutable bitmap for the canvas to draw into.

     * @see #setDensity(int)

     * @see #getDensity()

libs/hwui/SkiaCanvas.cpp

+32 −2
Original line number Diff line number Diff line
@@ -73,9 +73,39 @@ void SkiaCanvas::reset(SkCanvas* skiaCanvas) { 
// Canvas state operations: Replace Bitmap

// ----------------------------------------------------------------------------



class ClipCopier : public SkCanvas::ClipVisitor {

public:

    explicit ClipCopier(SkCanvas* dstCanvas) : m_dstCanvas(dstCanvas) {}



    virtual void clipRect(const SkRect& rect, SkClipOp op, bool antialias) {

        m_dstCanvas->clipRect(rect, op, antialias);

    }

    virtual void clipRRect(const SkRRect& rrect, SkClipOp op, bool antialias) {

        m_dstCanvas->clipRRect(rrect, op, antialias);

    }

    virtual void clipPath(const SkPath& path, SkClipOp op, bool antialias) {

        m_dstCanvas->clipPath(path, op, antialias);

    }



private:

    SkCanvas* m_dstCanvas;

};



void SkiaCanvas::setBitmap(const SkBitmap& bitmap) {

    mCanvasOwned.reset(new SkCanvas(bitmap));

    mCanvas = mCanvasOwned.get();

    SkCanvas* newCanvas = new SkCanvas(bitmap);



    if (!bitmap.isNull()) {

        // Copy the canvas matrix & clip state.

        newCanvas->setMatrix(mCanvas->getTotalMatrix());



        ClipCopier copier(newCanvas);

        mCanvas->replayClips(&copier);

    }



    // deletes the previously owned canvas (if any)

    mCanvasOwned = std::unique_ptr<SkCanvas>(newCanvas);

    mCanvas = newCanvas;



    // clean up the old save stack

    mSaveStack.reset(nullptr);

}