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

remove legacy flags

Browse Source 
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
This commit is contained in:
caryclark 2016-02-18 06:16:31 -08:00 committed by Commit bot
parent a110538912
commit a7b16858d5
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/SkEdgeBuilder.cpp
View File

@ -64,9 +64,6 @@ SkEdgeBuilder::Combine SkEdgeBuilder::CombineVertical(const SkEdge* edge, SkEdge
} }
static bool vertical_line(const SkEdge* edge) { 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; return !edge->fDX && !edge->fCurveCount;
} }

12
src/core/SkScan_Path.cpp
View File

@ -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 // 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 // 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 // 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; return prev;
} }
#endif
static void insert_new_edges(SkEdge* newEdge, int curr_y) { 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) { if (newEdge->fFirstY != curr_y) {
return; return;
} }
@ -112,7 +101,6 @@ nextEdge:
start = newEdge; start = newEdge;
newEdge = next; newEdge = next;
} while (newEdge->fFirstY == curr_y); } while (newEdge->fFirstY == curr_y);
#endif
} }
#ifdef SK_DEBUG #ifdef SK_DEBUG