diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-08-23 12:06:23 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-23 12:24:27 +0000 |
| commit | 5141d215e068c630dacc8865ffb46efd7f0f3911 (patch) | |
| tree | 4651168c71156597d69c5525baa996d29fc30a58 /src | |
| parent | c2bdc24795066d948005fd9070b03f6923c26fcb (diff) | |
Revert "Fix artifacts on tiny stroked paths scaled up a lot."
This reverts commit 267641a90cb18a430b0a84910f651e2181744fd3.
Reason for revert: Seems to be turning the bots red
Original change's description:
> Fix artifacts on tiny stroked paths scaled up a lot.
>
> Set doConsumeDegenerates to false when calling SkPath::Iter::next() for
> all paths which are not in screen space. These lines are not degenerate
> for world space paths.
>
> Bug: skia:6987
> Change-Id: I411faf594bf8a15891bfff08691e86679b7741ac
> Reviewed-on: https://skia-review.googlesource.com/36881
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Stephen White <senorblanco@chromium.org>
TBR=bsalomon@google.com,senorblanco@chromium.org
Change-Id: I0d5a14670126ab3e0d99083a500ec8d3d0ef9961
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:6987
Reviewed-on: https://skia-review.googlesource.com/37440
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/GrPathUtils.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/GrTessellator.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/ops/GrDefaultPathRenderer.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/ops/GrMSAAPathRenderer.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/GrPathUtils.cpp b/src/gpu/GrPathUtils.cpp index 0089fc1703..9a79f2061e 100644 --- a/src/gpu/GrPathUtils.cpp +++ b/src/gpu/GrPathUtils.cpp @@ -167,7 +167,7 @@ int GrPathUtils::worstCasePointCount(const SkPath& path, int* subpaths, SkScalar SkPath::Verb verb; SkPoint pts[4]; - while ((verb = iter.next(pts, false)) != SkPath::kDone_Verb) { + while ((verb = iter.next(pts)) != SkPath::kDone_Verb) { switch (verb) { case SkPath::kLine_Verb: diff --git a/src/gpu/GrTessellator.cpp b/src/gpu/GrTessellator.cpp index a1ea284bab..4d638ba60c 100644 --- a/src/gpu/GrTessellator.cpp +++ b/src/gpu/GrTessellator.cpp @@ -711,7 +711,7 @@ void path_to_contours(const SkPath& path, SkScalar tolerance, const SkRect& clip } SkAutoConicToQuads converter; SkPath::Verb verb; - while ((verb = iter.next(pts, false)) != SkPath::kDone_Verb) { + while ((verb = iter.next(pts)) != SkPath::kDone_Verb) { switch (verb) { case SkPath::kConic_Verb: { SkScalar weight = iter.conicWeight(); diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp index e3b48a8db9..4a436aa04b 100644 --- a/src/gpu/ops/GrDefaultPathRenderer.cpp +++ b/src/gpu/ops/GrDefaultPathRenderer.cpp @@ -148,7 +148,7 @@ public: bool done = false; while (!done) { - SkPath::Verb verb = iter.next(pts, false); + SkPath::Verb verb = iter.next(pts); switch (verb) { case SkPath::kMove_Verb: this->moveTo(pts[0]); diff --git a/src/gpu/ops/GrMSAAPathRenderer.cpp b/src/gpu/ops/GrMSAAPathRenderer.cpp index 20079dd425..ef19367f61 100644 --- a/src/gpu/ops/GrMSAAPathRenderer.cpp +++ b/src/gpu/ops/GrMSAAPathRenderer.cpp @@ -289,7 +289,7 @@ private: SkPath::Verb verb; SkPoint pts[4]; - while ((verb = iter.next(pts, false)) != SkPath::kDone_Verb) { + while ((verb = iter.next(pts)) != SkPath::kDone_Verb) { switch (verb) { case SkPath::kLine_Verb: linePointCount += 1; @@ -508,7 +508,7 @@ private: bool done = false; while (!done) { - SkPath::Verb verb = iter.next(pts, false); + SkPath::Verb verb = iter.next(pts); switch (verb) { case SkPath::kMove_Verb: if (!first) { |