defer to skia_for_chromium_defines.gypi for temporary guard defines

skia/skia_common.gypi

Index: skia/skia_common.gypi
diff --git a/skia/skia_common.gypi b/skia/skia_common.gypi
index 860b6fb10bf4ad3895a2020a17c975df048ee3d2..55536d7741e17a06f9bc2ed87cd5d0d5ae35e20c 100644
--- a/skia/skia_common.gypi
+++ b/skia/skia_common.gypi
@@ -5,6 +5,11 @@
 # This gypi file handles the removal of platform-specific files from the
 # Skia build.
 {
+  'includes': [
+    # skia_for_chromium_defines.gypi defines skia_for_chromium_defines
+    '../third_party/skia/gyp/skia_for_chromium_defines.gypi',
+  ],
+
   'include_dirs': [
     '..',
     'config',
@@ -147,11 +152,11 @@
       'SK_ENABLE_LEGACY_API_ALIASING=1',
       'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
       'GR_GL_IGNORE_ES3_MSAA=0',
-      'SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1',
-      'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1',
       'SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT',
-      'SK_SUPPORT_LEGACY_COPYTO_CONFIG',
-      'SK_SUPPORT_DEEPCOPYTO_CONFIG',
+
+      # This variable contains additional defines, specified in skia's
+      # skia_for_chromium_defines.gypi file.
+      '<@(skia_for_chromium_defines)',
     ],
 
     'default_font_cache_limit%': '(20*1024*1024)',
@@ -171,7 +176,7 @@
 
   'defines': [
     '<@(skia_export_defines)',
-
+    

[bungeman-chromium, 2014/02/25 18:06:51]

nit: don't need this whitespace change.

     # skia uses static initializers to initialize the serialization logic
     # of its "pictures" library. This is currently not used in chrome; if
     # it ever gets used the processes that use it need to call