commit 8df9a6801f9316dd7cb68abf4dc96caa0e202afa
author Kevin Lubick <kjlubick@google.com> Wed Dec 14 18:52:56 2022 +0000
committer Kevin Lubick <kjlubick@google.com> Thu Dec 15 21:47:05 2022 +0000
tree db17fe9ecb532c667d725ef7984b23de95eac5d5
parent 4343103a3f99fa778e994966fbc13c3a8a5ab6e0

Replace SkPaint::getFillPath with SkPathUtils::FillPathWithPaint

See https://skia-review.googlesource.com/c/skia/+/616821

Change-Id: I42a02b5d834b46b1418d4ea0934d1a49033f3115

libs/hwui/jni/Paint.cpp

diff --git a/libs/hwui/jni/Paint.cpp b/libs/hwui/jni/Paint.cpp
index f0a4bd0..b563627 100644
--- a/libs/hwui/jni/Paint.cpp
+++ b/libs/hwui/jni/Paint.cpp
@@ -33,6 +33,7 @@
 #include "SkMaskFilter.h"
 #include "SkPath.h"
 #include "SkPathEffect.h"
+#include "SkPathUtils.h"
 #include "SkShader.h"
 #include "SkBlendMode.h"
 #include "unicode/uloc.h"
@@ -809,7 +810,7 @@
         Paint* obj = reinterpret_cast<Paint*>(objHandle);
         SkPath* src = reinterpret_cast<SkPath*>(srcHandle);
         SkPath* dst = reinterpret_cast<SkPath*>(dstHandle);
-        return obj->getFillPath(*src, dst) ? JNI_TRUE : JNI_FALSE;
+        return skpathutils::FillPathWithPaint(*src, *obj, dst) ? JNI_TRUE : JNI_FALSE;
     }
 
     static jlong setShader(CRITICAL_JNI_PARAMS_COMMA jlong objHandle, jlong shaderHandle) {