Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Unified Diff: src/core/SkScan_Hairline.cpp

Issue 1050953003: remove dead code from SK_SUPPORT_LEGACY_BLITANTIH2V2 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkCoreBlitters.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkScan_Hairline.cpp
diff --git a/src/core/SkScan_Hairline.cpp b/src/core/SkScan_Hairline.cpp
index 2ec051f8abb1758b8f700aaf90a3145e679f77a3..4ed5ec254cc40ef6cb8597446f3bd473a52acd7d 100644
--- a/src/core/SkScan_Hairline.cpp
+++ b/src/core/SkScan_Hairline.cpp
@@ -218,18 +218,6 @@ static void hairquad(const SkPoint pts[3], const SkRegion* clip,
SkBlitter* blitter, int level, SkScan::HairRgnProc lineproc) {
SkASSERT(level <= kMaxQuadSubdivideLevel);
-#ifdef SK_SUPPORT_LEGACY_BLITANTIH2V2
- if (level > 0) {
- SkPoint tmp[5];
-
- SkChopQuadAtHalf(pts, tmp);
- hairquad(tmp, clip, blitter, level - 1, lineproc);
- hairquad(&tmp[2], clip, blitter, level - 1, lineproc);
- } else {
- SkPoint tmp[] = { pts[0], pts[2] };
- lineproc(tmp, 2, clip, blitter);
- }
-#else
SkPoint coeff[3];
SkQuadToCoeff(pts, coeff);
@@ -250,10 +238,8 @@ static void hairquad(const SkPoint pts[3], const SkRegion* clip,
}
tmp[lines] = pts[2];
lineproc(tmp, lines + 1, clip, blitter);
-#endif
}
-#ifndef SK_SUPPORT_LEGACY_BLITANTIH2V2
static inline Sk2s abs(const Sk2s& value) {
return Sk2s::Max(value, -value);
}
@@ -331,22 +317,9 @@ static void hair_cubic(const SkPoint pts[4], const SkRegion* clip, SkBlitter* bl
tmp[lines] = pts[3];
lineproc(tmp, lines + 1, clip, blitter);
}
-#endif
static inline void haircubic(const SkPoint pts[4], const SkRegion* clip,
SkBlitter* blitter, int level, SkScan::HairRgnProc lineproc) {
-#ifdef SK_SUPPORT_LEGACY_BLITANTIH2V2
- if (level > 0) {
- SkPoint tmp[7];
-
- SkChopCubicAt(pts, tmp, SK_Scalar1/2);
- haircubic(tmp, clip, blitter, level - 1, lineproc);
- haircubic(&tmp[3], clip, blitter, level - 1, lineproc);
- } else {
- SkPoint tmp[] = { pts[0], pts[3] };
- lineproc(tmp, 2, clip, blitter);
- }
-#else
if (quick_cubic_niceness_check(pts)) {
hair_cubic(pts, clip, blitter, lineproc);
} else {
@@ -358,7 +331,6 @@ static inline void haircubic(const SkPoint pts[4], const SkRegion* clip,
hair_cubic(&tmp[i * 3], clip, blitter, lineproc);
}
}
-#endif
}
static int compute_quad_level(const SkPoint pts[3]) {
« no previous file with comments | « src/core/SkCoreBlitters.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698