diff options
author | reed <reed@chromium.org> | 2015-02-06 18:07:39 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-06 18:07:39 -0800 |
commit | c319d075eab86cacfd7aba27859b72bbf8fc0a64 (patch) | |
tree | d19705f00b81f38bb5f47f14a3e3e411a5a1283c /src/core/SkEdgeBuilder.cpp | |
parent | 70f00046a4f207fd49e4fdf85614d93b224f6f7f (diff) |
Revert of faster edge re-sort, drop trailing edges (patchset #4 id:60001 of https://codereview.chromium.org/891613003/)
Reason for revert:
may be breaking layouttests...
Original issue's description:
> faster edge re-sort, drop trailing edges
>
> 1. drop edges that are wholly on the right (in the non-convex walker)
> 2. scan and swap once, instead of swapping as we go during re-sort
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/38f1c00772539dcbeccbfa3c45d94bdc4acf3518
TBR=caryclark@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/910493002
Diffstat (limited to 'src/core/SkEdgeBuilder.cpp')
-rw-r--r-- | src/core/SkEdgeBuilder.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/SkEdgeBuilder.cpp b/src/core/SkEdgeBuilder.cpp index 00811203b4..8dcc47a6ce 100644 --- a/src/core/SkEdgeBuilder.cpp +++ b/src/core/SkEdgeBuilder.cpp @@ -79,8 +79,8 @@ static void setShiftedClip(SkRect* dst, const SkIRect& src, int shift) { SkIntToScalar(src.fBottom >> shift)); } -int SkEdgeBuilder::buildPoly(const SkPath& path, const SkIRect* iclip, int shiftUp, - bool clipToTheRight) { +int SkEdgeBuilder::buildPoly(const SkPath& path, const SkIRect* iclip, + int shiftUp) { SkPath::Iter iter(path, true); SkPoint pts[4]; SkPath::Verb verb; @@ -115,7 +115,7 @@ int SkEdgeBuilder::buildPoly(const SkPath& path, const SkIRect* iclip, int shift break; case SkPath::kLine_Verb: { SkPoint lines[SkLineClipper::kMaxPoints]; - int lineCount = SkLineClipper::ClipLine(pts, clip, lines, clipToTheRight); + int lineCount = SkLineClipper::ClipLine(pts, clip, lines); SkASSERT(lineCount <= SkLineClipper::kMaxClippedLineSegments); for (int i = 0; i < lineCount; i++) { if (edge->setLine(lines[i], lines[i + 1], shiftUp)) { @@ -161,14 +161,14 @@ static void handle_quad(SkEdgeBuilder* builder, const SkPoint pts[3]) { } } -int SkEdgeBuilder::build(const SkPath& path, const SkIRect* iclip, int shiftUp, - bool clipToTheRight) { +int SkEdgeBuilder::build(const SkPath& path, const SkIRect* iclip, + int shiftUp) { fAlloc.reset(); fList.reset(); fShiftUp = shiftUp; if (SkPath::kLine_SegmentMask == path.getSegmentMasks()) { - return this->buildPoly(path, iclip, shiftUp, clipToTheRight); + return this->buildPoly(path, iclip, shiftUp); } SkAutoConicToQuads quadder; @@ -192,7 +192,7 @@ int SkEdgeBuilder::build(const SkPath& path, const SkIRect* iclip, int shiftUp, break; case SkPath::kLine_Verb: { SkPoint lines[SkLineClipper::kMaxPoints]; - int lineCount = SkLineClipper::ClipLine(pts, clip, lines, clipToTheRight); + int lineCount = SkLineClipper::ClipLine(pts, clip, lines); for (int i = 0; i < lineCount; i++) { this->addLine(&lines[i]); } |