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

Commit 835b5c95 authored by Chris Craik's avatar Chris Craik Committed by Android Git Automerger
Browse files

am f23132b9: am 4dae506c: am e27790db: Merge "Force isolation of clip and... 

am f23132b9: am 4dae506c: am e27790db: Merge "Force isolation of clip and matrix within layer" into lmp-dev

* commit 'f23132b917f5f9f5dffae189c0be1e06cfcdb9ef':
  Force isolation of clip and matrix within layer
parents 76d2e35f 1f8eb8ca

libs/hwui/DisplayListRenderer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ void DisplayListRenderer::restoreToCount(int saveCount) { 


int DisplayListRenderer::saveLayer(float left, float top, float right, float bottom,

        const SkPaint* paint, int flags) {

    // force matrix/clip isolation for layer

    flags |= SkCanvas::kClip_SaveFlag | SkCanvas::kMatrix_SaveFlag;



    paint = refPaint(paint);

    addStateOp(new (alloc()) SaveLayerOp(left, top, right, bottom, paint, flags));

    return StatefulBaseRenderer::save(flags);

libs/hwui/OpenGLRenderer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -638,6 +638,9 @@ void OpenGLRenderer::onSnapshotRestored(const Snapshot& removed, const Snapshot& 


int OpenGLRenderer::saveLayer(float left, float top, float right, float bottom,

        const SkPaint* paint, int flags, const SkPath* convexMask) {

    // force matrix/clip isolation for layer

    flags |= SkCanvas::kClip_SaveFlag | SkCanvas::kMatrix_SaveFlag;



    const int count = saveSnapshot(flags);



    if (!currentSnapshot()->isIgnored()) {