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

Commit 31669e14 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "use new SkPathFillType enum"

parents b11f9312 6a8bf8e9

core/jni/android/graphics/Path.cpp

+2 −2
Original line number Diff line number Diff line
@@ -497,12 +497,12 @@ public: 


    static jint getFillType(CRITICAL_JNI_PARAMS_COMMA jlong objHandle) {

        SkPath* obj = reinterpret_cast<SkPath*>(objHandle);

        return obj->getFillType();

        return static_cast<int>(obj->getFillType());

    }



    static void setFillType(CRITICAL_JNI_PARAMS_COMMA jlong pathHandle, jint ftHandle) {;

        SkPath* path = reinterpret_cast<SkPath*>(pathHandle);

        SkPath::FillType ft = static_cast<SkPath::FillType>(ftHandle);

        SkPathFillType ft = static_cast<SkPathFillType>(ftHandle);

        path->setFillType(ft);

    }

};

libs/hwui/VectorDrawable.cpp

+1 −2
Original line number Diff line number Diff line
@@ -135,8 +135,7 @@ const SkPath& FullPath::getUpdatedPath(bool useStagingData, SkPath* tempStagingP 
    bool setFillPath = properties.getFillGradient() != nullptr ||

                       properties.getFillColor() != SK_ColorTRANSPARENT;

    if (setFillPath) {

        SkPath::FillType ft = static_cast<SkPath::FillType>(properties.getFillType());

        outPath->setFillType(ft);

        outPath->setFillType(static_cast<SkPathFillType>(properties.getFillType()));

    }

    return *outPath;

}