aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkPathMeasure.cpp
diff options
context:
space:
mode:
authorGravatar Stan Iliev <stani@google.com>2018-03-16 21:01:09 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-03-16 21:01:16 +0000
commit0a86820f2fe3b62f2a5ac2917a1ef342dbe53722 (patch)
treeb49356c759de9f0cc731dbdad3a7ec0dde8321dc /src/core/SkPathMeasure.cpp
parent55fa647596be0952464820b46724ce4f358de7f7 (diff)
Revert "fix nextContour bug"
This reverts commit 473f69276f1854db80e094cc4af091f7f8a5b00b. Reason for revert: a CTS test PathMeasureTest.android.graphics.cts.PathMeasureTest.testNextContour is failing Original change's description: > fix nextContour bug > > Calling nextContour() needs to ensure that we've already measured the "current" one. > > Bug: skia: > Change-Id: I501c26d0b068028d67103888f06ec89125a5407a > Reviewed-on: https://skia-review.googlesource.com/114692 > Reviewed-by: Cary Clark <caryclark@google.com> > Commit-Queue: Mike Reed <reed@google.com> TBR=caryclark@google.com,reed@google.com Change-Id: I7f1e08651dfe73c02158b209dc28af2b174e246f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/114823 Reviewed-by: Stan Iliev <stani@google.com> Commit-Queue: Stan Iliev <stani@google.com>
Diffstat (limited to 'src/core/SkPathMeasure.cpp')
-rw-r--r--src/core/SkPathMeasure.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/SkPathMeasure.cpp b/src/core/SkPathMeasure.cpp
index 4fb18934d9..cdcd164018 100644
--- a/src/core/SkPathMeasure.cpp
+++ b/src/core/SkPathMeasure.cpp
@@ -667,7 +667,7 @@ bool SkPathMeasure::getSegment(SkScalar startD, SkScalar stopD, SkPath* dst,
}
bool SkPathMeasure::isClosed() {
- (void)this->getLength(); // make sure we measure the current contour
+ (void)this->getLength();
return fIsClosed;
}
@@ -675,8 +675,7 @@ bool SkPathMeasure::isClosed() {
we're done with the path.
*/
bool SkPathMeasure::nextContour() {
- (void)this->getLength(); // make sure we measure the current contour
- fLength = -1; // now signal that we should build the next set of segments
+ fLength = -1;
return this->getLength() > 0;
}