diff options
| author |  bungeman <bungeman@google.com> | 2015-02-25 12:30:48 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-25 12:30:48 -0800 |
| commit | edeb7a97aded2107fd6a25562e1bb7fdcb96c958 (patch) | |
| tree | 8ebd33aebe76ce0b7b3dcab330d71fe05a55b3b5 /src/core/SkScan_Path.cpp | |
| parent | 37a6107385ecb166b50588a9612e0e96acc0a898 (diff) | |
Remove SK_USE_LEGACY_AA_COVERAGE guarded code.
It doesn't appear anyone uses this flag anymore.
Review URL: https://codereview.chromium.org/943053004
Diffstat (limited to 'src/core/SkScan_Path.cpp')
| -rw-r--r-- | src/core/SkScan_Path.cpp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/core/SkScan_Path.cpp b/src/core/SkScan_Path.cpp index fd04609c21..d51cb5619a 100644 --- a/src/core/SkScan_Path.cpp +++ b/src/core/SkScan_Path.cpp @@ -17,10 +17,6 @@ #include "SkTemplates.h" #include "SkTSort.h" -#ifdef SK_USE_LEGACY_AA_COVERAGE - #define SK_USE_STD_SORT_FOR_EDGES -#endif - #define kEDGE_HEAD_Y SK_MinS32 #define kEDGE_TAIL_Y SK_MaxS32 @@ -368,27 +364,6 @@ static void PrePostInverseBlitterProc(SkBlitter* blitter, int y, bool isStart) { #pragma warning ( pop ) #endif -#ifdef SK_USE_STD_SORT_FOR_EDGES -extern "C" { - static int edge_compare(const void* a, const void* b) { - const SkEdge* edgea = *(const SkEdge**)a; - const SkEdge* edgeb = *(const SkEdge**)b; - - int valuea = edgea->fFirstY; - int valueb = edgeb->fFirstY; - - if (valuea == valueb) { - valuea = edgea->fX; - valueb = edgeb->fX; - } - - // this overflows if valuea >>> valueb or vice-versa - // return valuea - valueb; - // do perform the slower but safe compares - return (valuea < valueb) ? -1 : (valuea > valueb); - } -} -#else static bool operator<(const SkEdge& a, const SkEdge& b) { int valuea = a.fFirstY; int valueb = b.fFirstY; @@ -400,14 +375,9 @@ static bool operator<(const SkEdge& a, const SkEdge& b) { return valuea < valueb; } -#endif static SkEdge* sort_edges(SkEdge* list[], int count, SkEdge** last) { -#ifdef SK_USE_STD_SORT_FOR_EDGES - qsort(list, count, sizeof(SkEdge*), edge_compare); -#else SkTQSort(list, list + count - 1); -#endif // now make the edges linked in sorted order for (int i = 1; i < count; i++) { |