diff options
| author |  caryclark <caryclark@google.com> | 2016-02-18 06:16:31 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-18 06:16:31 -0800 |
| commit | a7b16858d51b5d9b7981087cadb1ff764632bf14 (patch) | |
| tree | d4c2d17b91055436aee783ac2baf527e041f0f65 | |
| parent | a11053891225b7c08466eef37068d8ff2dada168 (diff) | |
remove legacy flags
R=fmalita@chromium.org
BUG=573166
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1707383002
Review URL: https://codereview.chromium.org/1707383002
| -rw-r--r-- | src/core/SkEdgeBuilder.cpp | 3 | ||||
| -rw-r--r-- | src/core/SkScan_Path.cpp | 12 |
2 files changed, 0 insertions, 15 deletions
diff --git a/src/core/SkEdgeBuilder.cpp b/src/core/SkEdgeBuilder.cpp index dc390389c0..8ff68ee4fd 100644 --- a/src/core/SkEdgeBuilder.cpp +++ b/src/core/SkEdgeBuilder.cpp @@ -64,9 +64,6 @@ SkEdgeBuilder::Combine SkEdgeBuilder::CombineVertical(const SkEdge* edge, SkEdge } static bool vertical_line(const SkEdge* edge) { -#ifdef SK_SUPPORT_LEGACY_VERTICAL_EDGE // this disables combining vertical overlapping edges - return false; -#endif return !edge->fDX && !edge->fCurveCount; } diff --git a/src/core/SkScan_Path.cpp b/src/core/SkScan_Path.cpp index 077d9a0a24..4508865a99 100644 --- a/src/core/SkScan_Path.cpp +++ b/src/core/SkScan_Path.cpp @@ -61,7 +61,6 @@ static void backward_insert_edge_based_on_x(SkEdge* edge SkDECLAREPARAM(int, cur } } -#ifndef SK_SUPPORT_LEGACY_INSERT_NEW_EDGES // Start from the right side, searching backwards for the point to begin the new edge list // insertion, marching forwards from here. The implementation could have started from the left // of the prior insertion, and search to the right, or with some additional caching, binary @@ -72,18 +71,8 @@ static SkEdge* backward_insert_start(SkEdge* prev, SkFixed x) { } return prev; } -#endif static void insert_new_edges(SkEdge* newEdge, int curr_y) { -#ifdef SK_SUPPORT_LEGACY_INSERT_NEW_EDGES - SkASSERT(newEdge->fFirstY >= curr_y); - - while (newEdge->fFirstY == curr_y) { - SkEdge* next = newEdge->fNext; - backward_insert_edge_based_on_x(newEdge SkPARAM(curr_y)); - newEdge = next; - } -#else if (newEdge->fFirstY != curr_y) { return; } @@ -112,7 +101,6 @@ nextEdge: start = newEdge; newEdge = next; } while (newEdge->fFirstY == curr_y); -#endif } #ifdef SK_DEBUG |