From 8df9a6801f9316dd7cb68abf4dc96caa0e202afa Mon Sep 17 00:00:00 2001
From: Kevin Lubick <kjlubick@google.com>
Date: Wed, 14 Dec 2022 18:52:56 +0000
Subject: [PATCH] Replace SkPaint::getFillPath with
 SkPathUtils::FillPathWithPaint

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

Change-Id: I42a02b5d834b46b1418d4ea0934d1a49033f3115
---
 libs/hwui/jni/Paint.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/hwui/jni/Paint.cpp b/libs/hwui/jni/Paint.cpp
index f0a4bd0f00f0e..b563627edad9f 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 @@ namespace PaintGlue {
         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) {