Roll Skia DEPS to 12260

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 38 matching lines @@
 
     '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': [

[bungeman-skia, 2013/11/12 21:43:42]

Be sure to remove this 'defines' block before committing.

[robertphillips, 2013/11/12 23:00:23]

Done.

+          'SK_FONTHOST_DOES_NOT_USE_FONTMGR',
+        ],
       }],
     ],
   },
 
   'includes': [
     '../third_party/skia/gyp/core.gypi',
     '../third_party/skia/gyp/effects.gypi',
     '../third_party/skia/gyp/pdf.gypi',
   ],
 
@@ skipping 297 matching lines @@
       'sources!': [
         '../third_party/skia/src/ports/SkOSFile_posix.cpp',
         '../third_party/skia/src/ports/SkThread_pthread.cpp',
         '../third_party/skia/src/ports/SkTime_Unix.cpp',
         '../third_party/skia/src/ports/SkTLS_pthread.cpp',
       ],
       'include_dirs': [
         '../third_party/skia/include/utils/win',
         '../third_party/skia/src/utils/win',
       ],
-      'defines': [
-        'SK_FONTHOST_USES_FONTMGR',
-      ],
     },{ # not 'OS == "win"'
       'sources!': [
         '../third_party/skia/src/ports/SkFontHost_win_dw.cpp',
         '../third_party/skia/src/ports/SkFontMgr_default_gdi.cpp',
 
         '../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp',
         '../third_party/skia/src/utils/win/SkDWriteFontFileStream.h',
         '../third_party/skia/src/utils/win/SkDWriteGeometrySink.cpp',
         '../third_party/skia/src/utils/win/SkDWriteGeometrySink.h',
         '../third_party/skia/src/utils/win/SkHRESULT.cpp',
@@ skipping 36 matching lines @@
     # 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',
 
     # 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',
 
     'IGNORE_ROT_AA_RECT_OPT',
 
+    'SK_IGNORE_BLURRED_RRECT_OPT',
+
     'SK_IGNORE_QUAD_RR_CORNERS_OPT',
 
     'SKIA_IGNORE_GPU_MIPMAPS',
 
     # this flag forces Skia not to use typographic metrics with GDI.
     'SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS',
 
     'SK_DEFAULT_FONT_CACHE_LIMIT=<(default_font_cache_limit)',
 
      # http://crbug.com/314387
@@ skipping 13 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)',
     ],
   },
 }