Roll Skia DEPS to r8339

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 80 matching lines @@
         #'../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/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/SkFontHost_ascender.cpp',
-        '../third_party/skia/src/ports/SkFontHost_tables.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_sandbox_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 263 matching lines @@
             '../third_party/icu/icu.gyp:icuuc',
           ],
           'cflags': [
             '-Wno-unused',
             '-Wno-unused-function',
           ],
           'sources': [
             '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp',
             '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
           ],
-          'sources!': [
-            '../third_party/skia/src/ports/SkFontHost_tables.cpp',
-          ],
           'defines': [
 #            'SK_USE_COLOR_LUMINANCE',
           ],
         }],
         [ 'use_glib == 0 and OS != "android"', {
           'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ],
           'sources!': [
             '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
             '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp',
           ],
@@ skipping 80 matching lines @@
           'sources': [
             # This file is used on both iOS and Mac, so it should be removed
             #  from the ios and mac conditions and moved into the main sources
             #  list.
             '../third_party/skia/src/utils/mac/SkStream_mac.cpp',
           ],
           'sources/': [
             ['exclude', '/pdf/'],
             ['exclude', '^ext/vector_platform_device_skia\\.'],
             ['exclude', 'opts_check_SSE2\\.cpp$'],
-            ['exclude', 'SkFontHost_tables\\.cpp$',],
           ],
         }],
         [ 'OS == "mac"', {
           'defines': [
             'SK_BUILD_FOR_MAC',
             'SK_USE_MAC_CORE_TEXT',
 #           'SK_USE_COLOR_LUMINANCE',
           ],
           'include_dirs': [
             '../third_party/skia/include/utils/mac',
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
             ],
           },
           'sources': [
             '../third_party/skia/src/utils/mac/SkStream_mac.cpp',
           ],
-          'sources!': [
-            # The mac's fonthost implements the table methods natively,
-            # so no need for these generic versions.
-            '../third_party/skia/src/ports/SkFontHost_tables.cpp',
-          ],
         }],
         [ 'OS == "win"', {
           'sources!': [
             '../third_party/skia/src/core/SkMMapStream.cpp',
             '../third_party/skia/src/ports/SkFontHost_sandbox_none.cpp',
             '../third_party/skia/src/ports/SkThread_pthread.cpp',
             '../third_party/skia/src/ports/SkTime_Unix.cpp',
             'ext/SkThread_chrome.cc',
           ],
           'include_dirs': [
@@ skipping 334 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',
           ],
         },
       ],
     }],
   ],
 }