defer to skia_for_chromium_defines.gypi for temporary guard defines

skia/skia_common.gypi

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # 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',
   ],
 
   'conditions': [
     [ 'OS != "android"', {
       'sources/': [
          ['exclude', '_android\\.(cc|cpp)$'],
       ],
@@ skipping 122 matching lines @@
 
     # This list will contain all defines that also need to be exported to
     # dependent components.
     'skia_export_defines': [
       'SK_ENABLE_INST_COUNT=0',
       'SK_SUPPORT_GPU=<(skia_support_gpu)',
       'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
       '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)',
 
     'conditions': [
       ['OS== "android"', {
         # Android devices are typically more memory constrained, so
         # default to a smaller glyph cache (it may be overriden at runtime
         # when the renderer starts up, depending on the actual device memory).
         'default_font_cache_limit': '(1*1024*1024)',
         'skia_export_defines': [
           'SK_BUILD_FOR_ANDROID',
         ],
       }],
     ],
   },
 
   '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
     # SkGraphics::Init().
     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0',
 
     # Forcing the unoptimized path for the offset image filter in skia until
     # all filters used in Blink support the optimized path properly
     'SK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION',
 
@@ skipping 26 matching lines @@
   # re-export if they include Skia headers in their public headers.
   'all_dependent_settings': {
     'include_dirs': [
       '..',
       'config',
     ],
   },
 
   'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800],
 }