Roll Skia DEPS to r11429

skia/skia_library.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 contains the Skia library.
 # In component mode (shared_lib) it is folded into a single shared library with
 # the Chrome-specific enhancements but in all other cases it is a separate lib.
 {
   'dependencies': [
@@ skipping 22 matching lines @@
     # These two set the paths so we can include skia/gyp/core.gypi
     'skia_src_path': '../third_party/skia/src',
     'skia_include_path': '../third_party/skia/include',
 
     # 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',
     ],
 
     '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)',
@@ skipping 256 matching lines @@
       # This exports a hard dependency because it needs to run its
       # symlink action in order to expose the skia header files.
       'hard_dependency': 1,
       'include_dirs': [
         '../third_party/expat/files/lib',
       ],
     }],
     [ 'OS == "ios"', {
       'defines': [
         'SK_BUILD_FOR_IOS',
-        'SK_USE_MAC_CORE_TEXT',
       ],
       'include_dirs': [
         '../third_party/skia/include/utils/ios',
         '../third_party/skia/include/utils/mac',
       ],
       'link_settings': {
         'libraries': [
           '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework',
         ],
       },
@@ skipping 15 matching lines @@
       'dependencies': [
         'skia_library_opts.gyp:skia_opts_none',
       ],
       'dependencies!': [
         'skia_library_opts.gyp:skia_opts',
       ],
     }],
     [ 'OS == "mac"', {
       'defines': [
         'SK_BUILD_FOR_MAC',
-        'SK_USE_MAC_CORE_TEXT',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../third_party/skia/include/utils/mac',
         ],
       },
       'include_dirs': [
         '../third_party/skia/include/utils/mac',
       ],
       'link_settings': {
@@ skipping 52 matching lines @@
         ['include', 'SkFontHost_mac\\.cpp$',],
         ['include', 'SkStream_mac\\.cpp$',],
         ['include', 'SkCreateCGImageRef\\.cpp$',],
       ],
     }],
   ],
 
   'defines': [
     '<@(skia_export_defines)',
 
-    # this flag can be removed entirely once this has baked for a while
-    'SK_ALLOW_OVER_32K_BITMAPS',
-
     # 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',
 
     # Disable this check because it is too strict for some Chromium-specific
     # subclasses of SkPixelRef. See bug: crbug.com/171776.
     'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK',
 
@@ skipping 22 matching lines @@
       '../third_party/skia/include/pathops',
       '../third_party/skia/include/pipe',
       '../third_party/skia/include/ports',
       '../third_party/skia/include/utils',
     ],
     'defines': [
       '<@(skia_export_defines)',
     ],
   },
 }