Place r5997 (make arcto's convex) behind a compiler flag to delay day of reckoning with Webkit baselines
git-svn-id: http://skia.googlecode.com/svn/trunk@6012 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/PathBench.cpp b/bench/PathBench.cpp
index 3b3c52d..ac324a9 100644
--- a/bench/PathBench.cpp
+++ b/bench/PathBench.cpp
@@ -729,7 +729,9 @@
add_corner_arc(path, r, xCorner, yCorner, 90);
add_corner_arc(path, r, xCorner, yCorner, 180);
+#ifdef SK_REDEFINE_ROOT2OVER2_TO_MAKE_ARCTOS_CONVEX
SkASSERT(path->isConvex());
+#endif
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 70b4566..ac2defb 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -4,6 +4,7 @@
'defines': [
'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
# 'SK_SUPPORT_HINTING_SCALE_FACTOR',
+ 'SK_REDEFINE_ROOT2OVER2_TO_MAKE_ARCTOS_CONVEX',
],
'conditions' : [
['skia_gpu == 1',
diff --git a/src/core/SkGeometry.cpp b/src/core/SkGeometry.cpp
index d2aaeff..95b6247 100644
--- a/src/core/SkGeometry.cpp
+++ b/src/core/SkGeometry.cpp
@@ -1267,8 +1267,13 @@
// Switch over to using cubics rather then quads
// Use a different method to create the mid-point (e.g., compute
// the two side points, average them, then move it out as needed
+#ifdef SK_REDEFINE_ROOT2OVER2_TO_MAKE_ARCTOS_CONVEX
#define SK_ScalarRoot2Over2_QuadCircle 0.7072f
#else
+ #define SK_ScalarRoot2Over2_QuadCircle SK_ScalarRoot2Over2
+#endif
+
+#else
#define SK_ScalarRoot2Over2_QuadCircle SK_FixedRoot2Over2
#endif
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 6c8a400..d035b34 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -139,7 +139,9 @@
make_arb_round_rect(&temp, r, r.width() / 10, r.height() / 15);
+#ifdef SK_REDEFINE_ROOT2OVER2_TO_MAKE_ARCTOS_CONVEX
REPORTER_ASSERT(reporter, temp.isConvex());
+#endif
}
}