undef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES to fix callers

BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/824533002

diff --git a/gyp/skia_for_android_framework_defines.gypi b/gyp/skia_for_android_framework_defines.gypi
index 108a5518935e0ba4dcb3d342f41b89e9d56a6003..bde7f50cb33930b4d67fb59685bce19a6048fdc4 100644 (file)
--- a/gyp/skia_for_android_framework_defines.gypi
+++ b/gyp/skia_for_android_framework_defines.gypi
@@ -13,6 +13,7 @@
     # If these become 'permanent', they should be moved into common_variables.gypi
     #
     'skia_for_android_framework_defines': [
+      'SK_SUPPORT_LEGACY_GRADIENT_FACTORIES',
       'SK_SUPPORT_LEGACY_PUBLIC_IMAGEINFO_FIELDS',
       'SK_SUPPORT_LEGACY_GETDEVICE',
       # Needed until we fix skbug.com/2440.

diff --git a/gyp/skia_for_chromium_defines.gypi b/gyp/skia_for_chromium_defines.gypi
index a21427003419dacd9c223ab176670e1daf1bb237..f22be4a21023c6c96e266c38e4db2e4d0204d786 100644 (file)
--- a/gyp/skia_for_chromium_defines.gypi
+++ b/gyp/skia_for_chromium_defines.gypi
@@ -14,6 +14,7 @@
     #
     'skia_for_chromium_defines': [
       'SK_SUPPORT_LEGACY_GRADIENT_PRECISION',
+      'SK_SUPPORT_LEGACY_GRADIENT_FACTORIES',
     ],
   },
 }

diff --git a/include/effects/SkGradientShader.h b/include/effects/SkGradientShader.h
index 2d2fefe5cfd99ae3666795739927a39a18b3b60b..af88080d1839f085a0736c6b249dc2bc17fa9772 100644 (file)
--- a/include/effects/SkGradientShader.h
+++ b/include/effects/SkGradientShader.h
@@ -10,8 +10,6 @@
 
 #include "SkShader.h"
 
-#define SK_SUPPORT_LEGACY_GRADIENT_FACTORIES
-
 /** \class SkGradientShader
 
     SkGradientShader hosts factories for creating subclasses of SkShader that