diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 10 |
2 files changed, 1 insertions, 11 deletions
@@ -29,7 +29,7 @@ vars = { "ffmpeg_hash": "bb82a38d45e65c1fba378c15180b98ad76ebe1ca", "sfntly_revision": "134", - "skia_revision": "8255", + "skia_revision": "8339", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and V8 without interference from each other. diff --git a/skia/skia.gyp b/skia/skia.gyp index cc52aea..380f4ed 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -98,7 +98,6 @@ '../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', @@ -382,9 +381,6 @@ '../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', ], @@ -485,7 +481,6 @@ ['exclude', '/pdf/'], ['exclude', '^ext/vector_platform_device_skia\\.'], ['exclude', 'opts_check_SSE2\\.cpp$'], - ['exclude', 'SkFontHost_tables\\.cpp$',], ], }], [ 'OS == "mac"', { @@ -505,11 +500,6 @@ '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!': [ |