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

Commit e9c01a40 authored by Chris Craik's avatar Chris Craik
Browse files

Fix path clipping in VectorDrawable 

bug:19946683

Change-Id: I773957df7459eb72ea5d505afb0daac08239ecbf
parent 095d9990

graphics/java/android/graphics/drawable/VectorDrawable.java

+1 −1
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ public class VectorDrawable extends Drawable { 


            if (vPath.isClipPath()) {

                mRenderPath.addPath(path, mFinalPathMatrix);

                canvas.clipPath(mRenderPath, Region.Op.REPLACE);

                canvas.clipPath(mRenderPath);

            } else {

                VFullPath fullPath = (VFullPath) vPath;

                if (fullPath.mTrimPathStart != 0.0f || fullPath.mTrimPathEnd != 1.0f) {

libs/hwui/Snapshot.cpp

+3 −2
Original line number Diff line number Diff line
@@ -203,8 +203,9 @@ void Snapshot::dump() const { 
    ALOGD("Snapshot %p, flags %x, prev %p, height %d, ignored %d, hasComplexClip %d",

            this, flags, previous.get(), getViewportHeight(), isIgnored(), !mClipArea->isSimple());

    const Rect& clipRect(mClipArea->getClipRect());

    ALOGD("  ClipRect %.1f %.1f %.1f %.1f",

            clipRect.left, clipRect.top, clipRect.right, clipRect.bottom);

    ALOGD("  ClipRect %.1f %.1f %.1f %.1f, clip simple %d",

            clipRect.left, clipRect.top, clipRect.right, clipRect.bottom, mClipArea->isSimple());



    ALOGD("  Transform (at %p):", transform);

    transform->dump();

}