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/SkLineClipper.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/SkLineClipper.cpp')
| -rw-r--r-- | src/core/SkLineClipper.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/core/SkLineClipper.cpp b/src/core/SkLineClipper.cpp index 9d72ea513a..1645917d70 100644 --- a/src/core/SkLineClipper.cpp +++ b/src/core/SkLineClipper.cpp @@ -173,7 +173,7 @@ static void sect_with_horizontal_test_for_pin_results() { #endif int SkLineClipper::ClipLine(const SkPoint pts[], const SkRect& clip, - SkPoint lines[], bool canClipToTheRight) { + SkPoint lines[]) { #ifdef SK_DEBUG { static bool gOnce; @@ -241,9 +241,6 @@ int SkLineClipper::ClipLine(const SkPoint pts[], const SkRect& clip, result = tmp; reverse = false; } else if (tmp[index0].fX >= clip.fRight) { // wholly to the right - if (canClipToTheRight) { - return 0; - } tmp[0].fX = tmp[1].fX = clip.fRight; result = tmp; reverse = false; |