diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-22 16:12:15 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-22 16:12:15 +0000 |
| commit | e2bea4662416ee898e7498070e0473874cbf466e (patch) | |
| tree | a532580449b403e007936c632709a5e0a76460fa | |
| parent | 730021f97c480ca3603318872c93717769f9ea34 (diff) | |
| download | chromium_src-e2bea4662416ee898e7498070e0473874cbf466e.zip chromium_src-e2bea4662416ee898e7498070e0473874cbf466e.tar.gz chromium_src-e2bea4662416ee898e7498070e0473874cbf466e.tar.bz2 | |
Roll Skia DEPS to r8339
control: https://codereview.chromium.org/12827023/
Review URL: https://codereview.chromium.org/12989022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189823 0039d316-1c4b-4281-b951-d872f2087c98
| -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!': [ |