commit 97fa22998fa78c9032a343eb3c829a02562364c8
author Mike Reed <reed@google.com> Wed Mar 01 14:08:24 2017 -0500
committer Mike Reed <reed@google.com> Wed Mar 08 21:47:14 2017 +0000
tree 682f4d98d61fdcd58fae2d27b931d88fb48c8f85
parent 23e6ad0edab63091181f87b1b42ba931570c5496

switch to new SkPathEffect factories for Compose and Sum

Test: existing Paint tests exercise these factories

Change-Id: I38abd91203b06b1141dcb4fd96478f9e0a1d18ba

core/jni/android/graphics/PathEffect.cpp

diff --git a/core/jni/android/graphics/PathEffect.cpp b/core/jni/android/graphics/PathEffect.cpp
index e801da3..a4992de 100644
--- a/core/jni/android/graphics/PathEffect.cpp
+++ b/core/jni/android/graphics/PathEffect.cpp
@@ -20,7 +20,7 @@
                                      jlong outerHandle, jlong innerHandle) {
         SkPathEffect* outer = reinterpret_cast<SkPathEffect*>(outerHandle);
         SkPathEffect* inner = reinterpret_cast<SkPathEffect*>(innerHandle);
-        SkPathEffect* effect = SkComposePathEffect::Make(sk_ref_sp(outer),
+        SkPathEffect* effect = SkPathEffect::MakeCompose(sk_ref_sp(outer),
                 sk_ref_sp(inner)).release();
         return reinterpret_cast<jlong>(effect);
     }
@@ -29,7 +29,7 @@
                                  jlong firstHandle, jlong secondHandle) {
         SkPathEffect* first = reinterpret_cast<SkPathEffect*>(firstHandle);
         SkPathEffect* second = reinterpret_cast<SkPathEffect*>(secondHandle);
-        SkPathEffect* effect = SkSumPathEffect::Make(sk_ref_sp(first),
+        SkPathEffect* effect = SkPathEffect::MakeSum(sk_ref_sp(first),
                 sk_ref_sp(second)).release();
         return reinterpret_cast<jlong>(effect);
     }