commit e1cb9ac0e1bbf99d7a66dc630bcffe2852f4f887
author Brian Osman <brianosman@google.com> Mon Jun 24 10:44:02 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jun 24 15:10:38 2019 +0000
tree 4ef2419c56c63940c8a5daf148c8482230e38f7b
parent 91032f8cd7eaf5ab5d562b6bf8b726000ae33709

Particles: SkScalar -> float

Pulling this cleanup out of a larger CL

Change-Id: Ib3ecff5d242eba72a7f2bc3ce07e09760a9ba7b7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/223181
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

modules/particles/include/SkCurve.h

diff --git a/modules/particles/include/SkCurve.h b/modules/particles/include/SkCurve.h
index 4db4615..efe2d81 100644
--- a/modules/particles/include/SkCurve.h
+++ b/modules/particles/include/SkCurve.h
@@ -9,7 +9,6 @@
 #define SkCurve_DEFINED
 
 #include "include/core/SkColor.h"
-#include "include/core/SkScalar.h"
 #include "include/private/SkTArray.h"
 #include "modules/particles/include/SkParticleData.h"
 
@@ -50,17 +49,17 @@
 };
 
 struct SkCurveSegment {
-    SkScalar eval(SkScalar x, SkScalar t, bool negate) const;
+    float eval(float x, float t, bool negate) const;
     void visitFields(SkFieldVisitor* v);
 
-    void setConstant(SkScalar c) {
+    void setConstant(float c) {
         fType   = kConstant_SegmentType;
         fRanged = false;
         fMin[0] = c;
     }
 
-    SkScalar fMin[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
-    SkScalar fMax[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
+    float fMin[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
+    float fMax[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
 
     int  fType          = kConstant_SegmentType;
     bool fRanged        = false;
@@ -68,18 +67,18 @@
 };
 
 struct SkCurve {
-    SkCurve(SkScalar c = 0.0f) {
+    SkCurve(float c = 0.0f) {
         fSegments.push_back().setConstant(c);
     }
 
-    SkScalar eval(const SkParticleUpdateParams& params, SkParticleState& ps) const;
+    float eval(const SkParticleUpdateParams& params, SkParticleState& ps) const;
     void visitFields(SkFieldVisitor* v);
 
     // Parameters that determine our x-value during evaluation
     SkParticleValue                fInput;
 
     // It should always be true that (fXValues.count() + 1) == fSegments.count()
-    SkTArray<SkScalar, true>       fXValues;
+    SkTArray<float, true>          fXValues;
     SkTArray<SkCurveSegment, true> fSegments;
 };
 
@@ -97,7 +96,7 @@
         }
     }
 
-    SkColor4f eval(SkScalar x, SkScalar t) const;
+    SkColor4f eval(float x, float t) const;
     void visitFields(SkFieldVisitor* v);
 
     void setConstant(SkColor4f c) {
@@ -122,7 +121,7 @@
     void visitFields(SkFieldVisitor* v);
 
     SkParticleValue                     fInput;
-    SkTArray<SkScalar, true>            fXValues;
+    SkTArray<float, true>               fXValues;
     SkTArray<SkColorCurveSegment, true> fSegments;
 };