Roll Skia DEPS to r9249

skia/skia.gyp

 # Copyright (c) 2012 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.
 
 {
   'targets': [
     {
       'target_name': 'skia',
       'type': '<(component)',
       'variables': {
@@ skipping 74 matching lines @@
         '../third_party/skia/src/pdf/SkPDFStream.h',
         '../third_party/skia/src/pdf/SkPDFTypes.cpp',
         '../third_party/skia/src/pdf/SkPDFTypes.h',
         '../third_party/skia/src/pdf/SkPDFUtils.cpp',
         '../third_party/skia/src/pdf/SkPDFUtils.h',
 
         #'../third_party/skia/src/ports/SkPurgeableMemoryBlock_android.cpp',
         #'../third_party/skia/src/ports/SkPurgeableMemoryBlock_mac.cpp',
         '../third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp',
 
-        '../third_party/skia/src/ports/FontHostConfiguration_android.cpp',
+        '../third_party/skia/src/ports/SkFontConfigInterface_android.cpp',
         #'../third_party/skia/src/ports/SkFontHost_FONTPATH.cpp',
         '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
         '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp',
         '../third_party/skia/src/ports/SkFontHost_FreeType_common.h',
-        '../third_party/skia/src/ports/SkFontHost_android.cpp',
+        '../third_party/skia/src/ports/SkFontConfigParser_android.cpp',
         #'../third_party/skia/src/ports/SkFontHost_ascender.cpp',
         #'../third_party/skia/src/ports/SkFontHost_linux.cpp',
         '../third_party/skia/src/ports/SkFontHost_mac.cpp',
         #'../third_party/skia/src/ports/SkFontHost_none.cpp',
         '../third_party/skia/src/ports/SkFontHost_win.cpp',
         '../third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp',
         #'../third_party/skia/src/ports/SkImageDecoder_CG.cpp',
         #'../third_party/skia/src/ports/SkImageDecoder_empty.cpp',
         #'../third_party/skia/src/ports/SkImageRef_ashmem.cpp',
         #'../third_party/skia/src/ports/SkImageRef_ashmem.h',
@@ skipping 208 matching lines @@
           },
           'sources!': [
             'ext/SkThread_chrome.cc',
           ],
         }],
         [ 'OS != "android"', {
           'sources/': [
             ['exclude', '_android\\.(cc|cpp)$'],
           ],
           'sources!': [
-            '../third_party/skia/src/core/SkPaintOptionsAndroid.cpp'
+            '../third_party/skia/src/core/SkPaintOptionsAndroid.cpp',
           ],
           'defines': [
             'SK_DEFAULT_FONT_CACHE_LIMIT=(20*1024*1024)',
           ],
         }],
         [ 'OS != "ios"', {
           'sources/': [
             ['exclude', '_ios\\.(cc|cpp|mm?)$'],
           ],
           'dependencies': [
@@ skipping 47 matching lines @@
           ],
         }],
         [ 'toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gdk',
           ],
         }, {  # toolkit_uses_gtk == 0
           'sources/': [ ['exclude', '_gtk\\.(cc|cpp)$'] ],
         }],
         [ 'OS == "android"', {
+          'sources': [
+            '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp',
+          ],
           'sources/': [
             ['exclude', '_linux\\.(cc|cpp)$'],
           ],
           'conditions': [
             [ '_toolset == "target"', {
               'defines': [
                 'HAVE_PTHREADS',
                 'OS_ANDROID',
                 'SK_BUILD_FOR_ANDROID',
                 # Android devices are typically more memory constrained, so
@@ skipping 428 matching lines @@
           'sources': [
             '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
           ],
         },
       ],
     }],
   ],
 }