aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar hstern <hstern@google.com>2016-08-10 07:45:31 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-08-10 07:45:31 -0700
commit80ac591f9928f36ea1dac80f34b9ad048e92ef73 (patch)
tree7bcffdaf933c7ea1bd80781b57296961e28dea8e /src
parentd434b01c7e589b721c7969d7dfc6a25f99bdc23b (diff)
Add time return argument to SkCurveMeasure's getPosTan, rename to getPosTanTime
Diffstat (limited to 'src')
-rw-r--r--src/utils/SkCurveMeasure.cpp7
-rw-r--r--src/utils/SkCurveMeasure.h2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/utils/SkCurveMeasure.cpp b/src/utils/SkCurveMeasure.cpp
index 785bca7cfd..fc2aa84faa 100644
--- 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 b2d0ea17f3..2846103633 100644
--- 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: