AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "fix nextContour bug"

Browse Source 
This reverts commit 473f69276f.

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>
This commit is contained in:
Stan Iliev 2018-03-16 21:01:09 +00:00 committed by Skia Commit-Bot
parent 55fa647596
commit 0a86820f2f
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/SkPathMeasure.cpp
View File

@ -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;
}

10
tests/PathMeasureTest.cpp
View File

@ -217,13 +217,3 @@ DEF_TEST(PathMeasureConic, reporter) {
REPORTER_ASSERT(reporter, 19.5f < stdP.fX && stdP.fX < 20.5f);
REPORTER_ASSERT(reporter, 19.5f < hiP.fX && hiP.fX < 20.5f);
}
// Regression test for b/26425223
DEF_TEST(PathMeasure_nextctr, reporter) {
SkPath path;
path.moveTo(0, 0); path.lineTo(100, 0);
SkPathMeasure meas(path, false);
// only expect 1 contour, even if we didn't explicitly call getLength() ourselves
REPORTER_ASSERT(reporter, !meas.nextContour());
}