commit dd1e5ef225c67322678451d3019f19db793b8f4e
author Kevin Lubick <kjlubick@google.com> Thu Feb 16 19:50:00 2023 +0000
committer Leon Scroggins <scroggo@google.com> Mon Feb 27 20:29:50 2023 +0000
tree 0f8a384898d8988efbb09f6b577f27fd76dea58b
parent b981c2d6061596cfaa86542a215d24e2b3f69779

Remove SK_SCALAR_IS_FLOAT checks, they are always true

SkScalar used to be float or double (or fixed) but has been float
only since 2017
https://github.com/google/skia/commit/529bcd6db7ebfa3a9e4898696cfc869839045176

Bug: skbug.com/13983
Bug: 178700363
Change-Id: I822ad61e6522e7c0757905b7d0d1b4da920c418f
(cherry picked from commit ceb226900957b8c5af99b497226ba42296475e1b)
Merged-In: I822ad61e6522e7c0757905b7d0d1b4da920c418f

libs/hwui/jni/PathEffect.cpp

diff --git a/libs/hwui/jni/PathEffect.cpp b/libs/hwui/jni/PathEffect.cpp
index f99bef7..3dbe1a6 100644
--- a/libs/hwui/jni/PathEffect.cpp
+++ b/libs/hwui/jni/PathEffect.cpp
@@ -35,11 +35,7 @@
                                       jfloatArray intervalArray, jfloat phase) {
         AutoJavaFloatArray autoInterval(env, intervalArray);
         int         count = autoInterval.length() & ~1;  // even number
-#ifdef SK_SCALAR_IS_FLOAT
-        SkScalar*   intervals = autoInterval.ptr();
-#else
-        #error Need to convert float array to SkScalar array before calling the following function.
-#endif
+        SkScalar* intervals = autoInterval.ptr();
         SkPathEffect* effect = SkDashPathEffect::Make(intervals, count, phase).release();
         return reinterpret_cast<jlong>(effect);
     }