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

Commit c33b943f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "deprecate replayClips"

parents 8a8e33db 82d3b17f
Loading
Loading
Loading
Loading
+3 −20
Original line number Diff line number Diff line
@@ -73,24 +73,6 @@ 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) {
    SkCanvas* newCanvas = new SkCanvas(bitmap);

@@ -98,8 +80,9 @@ void SkiaCanvas::setBitmap(const SkBitmap& bitmap) {
        // Copy the canvas matrix & clip state.
        newCanvas->setMatrix(mCanvas->getTotalMatrix());

        ClipCopier copier(newCanvas);
        mCanvas->replayClips(&copier);
        SkRegion rgn;
        mCanvas->temporary_internal_getRgnClip(&rgn);
        newCanvas->clipRegion(rgn, SkClipOp::kIntersect);
    }

    // deletes the previously owned canvas (if any)