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

Commit 02a26300 authored by Tom Hudson's avatar Tom Hudson
Browse files

Switch framework to new Skia enums 

Allow Skia to finish deprecating old path operation enumerations.

Change-Id: I61e4489e639043acb78d47994ab62a31f18bd878
parent 0c83048b

libs/hwui/OpenGLRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1913,7 +1913,7 @@ void OpenGLRenderer::drawCircle(float x, float y, float radius, const SkPaint* p 


        // Mask the ripple path by the projection mask, now that it's

        // in local space. Note that this can create CCW paths.

        Op(path, maskPath, kIntersect_PathOp, &path);

        Op(path, maskPath, kIntersect_SkPathOp, &path);

    }

    drawConvexPath(path, p);

}

libs/hwui/RenderNode.cpp

+2 −2
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ void RenderNode::issueDrawShadowOperation(const Matrix4& transformFromParent, T& 
    if (revealClipPath) {

        frameAllocatedPath = handler.allocPathForFrame();



        Op(*outlinePath, *revealClipPath, kIntersect_PathOp, frameAllocatedPath);

        Op(*outlinePath, *revealClipPath, kIntersect_SkPathOp, frameAllocatedPath);

        outlinePath = frameAllocatedPath;

    }
@@ -708,7 +708,7 @@ void RenderNode::issueDrawShadowOperation(const Matrix4& transformFromParent, T& 
        clipBoundsPath.addRect(clipBounds.left, clipBounds.top,

                clipBounds.right, clipBounds.bottom);



        Op(*outlinePath, clipBoundsPath, kIntersect_PathOp, frameAllocatedPath);

        Op(*outlinePath, clipBoundsPath, kIntersect_SkPathOp, frameAllocatedPath);

        outlinePath = frameAllocatedPath;

    }