commit 194bf824f0b16be9de66233c9baf447f11e13758
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 23 20:45:26 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 23 20:45:26 2013 +0000
tree 57f1936f8ee8cce4855c2b2810337e512e14b5d9
parent 728302281920727b96e6cec0bfc7575900f34a8b

Reverse sense of convex-quad-fix compiler flag

https://codereview.appspot.com/7206045/



git-svn-id: http://skia.googlecode.com/svn/trunk@7349 2bbb7eff-a529-9590-31e7-b0007b416f81

bench/PathBench.cpp

diff --git a/bench/PathBench.cpp b/bench/PathBench.cpp
index ad9ca1d..6fd0759 100644
--- a/bench/PathBench.cpp
+++ b/bench/PathBench.cpp
@@ -745,7 +745,7 @@
         add_corner_arc(path, r, xCorner, yCorner, 180);
         path->close();
 
-#ifdef SK_REDEFINE_ROOT2OVER2_TO_MAKE_ARCTOS_CONVEX
+#ifndef SK_IGNORE_CONVEX_QUAD_OPT
         SkASSERT(path->isConvex());
 #endif
     }

gyp/common_conditions.gypi

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index ff4caf8..d61cc94 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -4,7 +4,6 @@
   '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',

src/core/SkGeometry.cpp

diff --git a/src/core/SkGeometry.cpp b/src/core/SkGeometry.cpp
index 137cd79..3114ccb 100644
--- a/src/core/SkGeometry.cpp
+++ b/src/core/SkGeometry.cpp
@@ -1267,7 +1267,7 @@
 //    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
+#ifndef SK_IGNORE_CONVEX_QUAD_OPT
     #define SK_ScalarRoot2Over2_QuadCircle    0.7072f
 #else
     #define SK_ScalarRoot2Over2_QuadCircle    SK_ScalarRoot2Over2

tests/PathTest.cpp

diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 5079b7e..d4442cb 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -308,7 +308,7 @@
 
         make_arb_round_rect(&temp, r, r.width() / 10, r.height() / 15);
 
-#ifdef SK_REDEFINE_ROOT2OVER2_TO_MAKE_ARCTOS_CONVEX
+#ifndef SK_IGNORE_CONVEX_QUAD_OPT
         REPORTER_ASSERT(reporter, temp.isConvex());
 #endif
     }
@@ -337,7 +337,7 @@
 
         make_arb_round_rect(&temp, r, 0, 0);
 
-#ifdef SK_REDEFINE_ROOT2OVER2_TO_MAKE_ARCTOS_CONVEX
+#ifndef SK_IGNORE_CONVEX_QUAD_OPT
         SkRect result;
         REPORTER_ASSERT(reporter, temp.isRect(&result));
         REPORTER_ASSERT(reporter, r == result);