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

Commit 2a5c242c authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Override getSaveLayerStrategy instead of willSaveLayer"

parents eb80f7c6 5518e7cb

libs/hwui/SkiaCanvasProxy.cpp

+6 −6
Original line number Diff line number Diff line
@@ -162,15 +162,15 @@ void SkiaCanvasProxy::willSave() { 
    mCanvas->save(SkCanvas::kMatrixClip_SaveFlag);

}



SkCanvas::SaveLayerStrategy SkiaCanvasProxy::willSaveLayer(const SkRect* rectPtr,

        const SkPaint* paint, SaveFlags flags) {

SkCanvas::SaveLayerStrategy SkiaCanvasProxy::getSaveLayerStrategy(const SaveLayerRec& saveLayerRec) {

    SkRect rect;

    if (rectPtr) {

        rect = *rectPtr;

    if (saveLayerRec.fBounds) {

        rect = *saveLayerRec.fBounds;

    } else if (!mCanvas->getClipBounds(&rect)) {

        rect = SkRect::MakeEmpty();

    }

    mCanvas->saveLayer(rect.fLeft, rect.fTop, rect.fRight, rect.fBottom, paint, flags);

    mCanvas->saveLayer(rect.fLeft, rect.fTop, rect.fRight, rect.fBottom, saveLayerRec.fPaint,

                       (SkCanvas::SaveFlags) SaveLayerFlagsToSaveFlags(saveLayerRec.fSaveLayerFlags));

    return SkCanvas::kNoLayer_SaveLayerStrategy;

}

libs/hwui/SkiaCanvasProxy.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ protected: 
    virtual SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override;



    virtual void willSave() override;

    virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) override;

    virtual SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec&) override;

    virtual void willRestore() override;



    virtual void didConcat(const SkMatrix&) override;