Update from chromium https://crrev.com/301315

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': [
+    # blink_skia_config.gypi defines blink_skia_defines
+    '../third_party/WebKit/public/blink_skia_config.gypi',
+
     # skia_for_chromium_defines.gypi defines skia_for_chromium_defines
     '../third_party/skia/gyp/skia_for_chromium_defines.gypi',
   ],
 
   'include_dirs': [
     '..',
     'config',
   ],
 
   'conditions': [
@@ skipping 130 matching lines @@
     # 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_WILL_NEVER_DRAW_PERSPECTIVE_TEXT',
 
+      # This variable contains additional defines, specified in blink's
+      # blink_skia_config.gypi file.
+      '<@(blink_skia_defines)',
+
       # 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
@@ skipping 43 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],
 }