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

Revert "Make PathGeoBuilder use consistent iterators."

Browse Source 
This reverts commit 9c8a16bb1e.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Make PathGeoBuilder use consistent iterators.
> 
> Previously it used a degenerate consuming iterator to determine the whether there were multiple contours. This was inconsistent with the tessellating step.
> 
> Bug: chromium:788500
> Change-Id: I3938c69cf40bc551acdb8d5fa9b54d2c96e2a460
> Reviewed-on: https://skia-review.googlesource.com/76961
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

TBR=bsalomon@google.com,brianosman@google.com

Change-Id: I18005ea2d7ba88c66334f110a5a74c6d82e4ab90
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:788500
Reviewed-on: https://skia-review.googlesource.com/77440
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Brian Salomon 2017-11-29 13:30:00 +00:00 committed by Skia Commit-Bot
parent 9c8a16bb1e
commit b451321324
3 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gm/crbug_788500.cpp
View File

@ -1,23 +0,0 @@
/*
* Copyright 2017 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "SkCanvas.h"
#include "SkPaint.h"
#include "SkPath.h"
#include "gm.h"
DEF_SIMPLE_GM(crbug_788500, canvas, 300, 300) {
SkPath path;
path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.moveTo(245.5f, 98.5f);
path.cubicTo(245.5f, 98.5f, 242, 78, 260, 75);
SkPaint paint;
paint.setAntiAlias(true);
canvas->drawPath(path, paint);
}

1
gn/gm.gni
View File

@ -92,7 +92,6 @@ gm_sources = [
"$_gm/convexpolyeffect.cpp",
"$_gm/copyTo4444.cpp",
"$_gm/crbug_691386.cpp",
"$_gm/crbug_788500.cpp",
"$_gm/croppedrects.cpp",
"$_gm/crosscontextimage.cpp",
"$_gm/cubicpaths.cpp",

2
src/gpu/ops/GrDefaultPathRenderer.cpp
View File

@ -180,7 +180,7 @@ public:
SkPath::Verb verb;
SkPoint pts[4];
while ((verb = iter.next(pts, false)) != SkPath::kDone_Verb) {
while ((verb = iter.next(pts)) != SkPath::kDone_Verb) {
if (SkPath::kMove_Verb == verb && !first) {
return true;
}