Add time return argument to SkCurveMeasure's getPosTan, rename to getPosTanTime

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2229893002

Review-Url: https://codereview.chromium.org/2229893002

diff --git a/bench/MeasureBench.cpp b/bench/MeasureBench.cpp
index d76bd35..1b0ec21 100644 (file)
--- a/bench/MeasureBench.cpp
+++ b/bench/MeasureBench.cpp
@@ -88,7 +88,7 @@ class MeasureBench : public Benchmark {
 
         SkPoint point;
         for (size_t i = 0; i <= fPieces; i++) {
-            meas.getPosTan(i*pieceLength, &point, nullptr);
+            meas.getPosTanTime(i*pieceLength, &point, nullptr, nullptr);
         }
     }
 

diff --git a/src/utils/SkCurveMeasure.cpp b/src/utils/SkCurveMeasure.cpp
index 785bca7..fc2aa84 100644 (file)
--- a/src/utils/SkCurveMeasure.cpp
+++ b/src/utils/SkCurveMeasure.cpp
@@ -234,10 +234,13 @@ SkScalar SkCurveMeasure::getTime(SkScalar targetLength) {
     return currentT;
 }
 
-void SkCurveMeasure::getPosTan(SkScalar targetLength, SkPoint* pos,
-                               SkVector* tan) {
+void SkCurveMeasure::getPosTanTime(SkScalar targetLength, SkPoint* pos,
+                               SkVector* tan, SkScalar* time) {
     SkScalar t = getTime(targetLength);
 
+    if (time) {
+        *time = t;
+    }
     if (pos) {
         // TODO(hstern) switch here on curve type.
         *pos = evaluateQuad(t);

diff --git a/src/utils/SkCurveMeasure.h b/src/utils/SkCurveMeasure.h
index b2d0ea1..2846103 100644 (file)
--- a/src/utils/SkCurveMeasure.h
+++ b/src/utils/SkCurveMeasure.h
@@ -47,7 +47,7 @@ public:
     SkCurveMeasure(const SkPoint* pts, SkSegType segType);
 
     SkScalar getTime(SkScalar targetLength);
-    void getPosTan(SkScalar distance, SkPoint* pos, SkVector* tan);
+    void getPosTanTime(SkScalar distance, SkPoint* pos, SkVector* tan, SkScalar* time);
     SkScalar getLength();
 
 private: