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

Commit 39971551 authored by Ryan Prichard's avatar Ryan Prichard
Browse files

Move SkiaCanvas::Clip above SkiaCanvas::SkiaCanvas 

After upgrading libc++, there are errors complaining about the the
incomplete Clip type in the "std::vector<Clip> mClipStack" member of
SkiaCanvas. The "SkiaCanvas::SkiaCanvas() {}" ctor can call ~vector
(maybe when an exception is thrown), and ~vector needs to know the size
of Clip.

(I'm not sure why this wasn't a problem before, but this seems to fix
the problem.)

Bug: http://b/175635923
Test: treehugger
Change-Id: I1d689c91be3b0530272836eeb727709ff1084545
parent e648d3cb

libs/hwui/SkiaCanvas.cpp

+43 −43
Original line number Diff line number Diff line
@@ -51,6 +51,49 @@ namespace android { 


using uirenderer::PaintUtils;



class SkiaCanvas::Clip {

public:

    Clip(const SkRect& rect, SkClipOp op, const SkMatrix& m)

            : mType(Type::Rect), mOp(op), mMatrix(m), mRRect(SkRRect::MakeRect(rect)) {}

    Clip(const SkRRect& rrect, SkClipOp op, const SkMatrix& m)

            : mType(Type::RRect), mOp(op), mMatrix(m), mRRect(rrect) {}

    Clip(const SkPath& path, SkClipOp op, const SkMatrix& m)

            : mType(Type::Path), mOp(op), mMatrix(m), mPath(std::in_place, path) {}



    void apply(SkCanvas* canvas) const {

        canvas->setMatrix(mMatrix);

        switch (mType) {

            case Type::Rect:

                // Don't anti-alias rectangular clips

                canvas->clipRect(mRRect.rect(), mOp, false);

                break;

            case Type::RRect:

                // Ensure rounded rectangular clips are anti-aliased

                canvas->clipRRect(mRRect, mOp, true);

                break;

            case Type::Path:

                // Ensure path clips are anti-aliased

                canvas->clipPath(mPath.value(), mOp, true);

                break;

        }

    }



private:

    enum class Type {

        Rect,

        RRect,

        Path,

    };



    Type mType;

    SkClipOp mOp;

    SkMatrix mMatrix;



    // These are logically a union (tracked separately due to non-POD path).

    std::optional<SkPath> mPath;

    SkRRect mRRect;

};



Canvas* Canvas::create_canvas(const SkBitmap& bitmap) {

    return new SkiaCanvas(bitmap);

}
@@ -194,49 +237,6 @@ void SkiaCanvas::restoreUnclippedLayer(int restoreCount, const Paint& paint) { 
    }

}



class SkiaCanvas::Clip {

public:

    Clip(const SkRect& rect, SkClipOp op, const SkMatrix& m)

            : mType(Type::Rect), mOp(op), mMatrix(m), mRRect(SkRRect::MakeRect(rect)) {}

    Clip(const SkRRect& rrect, SkClipOp op, const SkMatrix& m)

            : mType(Type::RRect), mOp(op), mMatrix(m), mRRect(rrect) {}

    Clip(const SkPath& path, SkClipOp op, const SkMatrix& m)

            : mType(Type::Path), mOp(op), mMatrix(m), mPath(std::in_place, path) {}



    void apply(SkCanvas* canvas) const {

        canvas->setMatrix(mMatrix);

        switch (mType) {

            case Type::Rect:

                // Don't anti-alias rectangular clips

                canvas->clipRect(mRRect.rect(), mOp, false);

                break;

            case Type::RRect:

                // Ensure rounded rectangular clips are anti-aliased

                canvas->clipRRect(mRRect, mOp, true);

                break;

            case Type::Path:

                // Ensure path clips are anti-aliased

                canvas->clipPath(mPath.value(), mOp, true);

                break;

        }

    }



private:

    enum class Type {

        Rect,

        RRect,

        Path,

    };



    Type mType;

    SkClipOp mOp;

    SkMatrix mMatrix;



    // These are logically a union (tracked separately due to non-POD path).

    std::optional<SkPath> mPath;

    SkRRect mRRect;

};



const SkiaCanvas::SaveRec* SkiaCanvas::currentSaveRec() const {

    const SaveRec* rec = mSaveStack ? static_cast<const SaveRec*>(mSaveStack->back()) : nullptr;

    int currentSaveCount = mCanvas->getSaveCount();