diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 13:11:54 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 13:11:54 +0000 |
| commit | 9628e0d1b18acb3ef20752bfa19737338d26346c (patch) | |
| tree | 351c06ac28c8e89f99825fa0ef82250b36bd006f /skia/skia.gyp | |
| parent | 0b57b3ae0fcffa1f1734c19b92c1b3c8ecb3a4c7 (diff) | |
| download | chromium_src-9628e0d1b18acb3ef20752bfa19737338d26346c.zip chromium_src-9628e0d1b18acb3ef20752bfa19737338d26346c.tar.gz chromium_src-9628e0d1b18acb3ef20752bfa19737338d26346c.tar.bz2 | |
re-land 187283 -- switch to skia's version of SkFontHost_fontconfig
add suppressions.txt to account for global typeface cache
Review URL: https://codereview.chromium.org/12764009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 8c3aa6b..6fcdc5c 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -182,6 +182,8 @@ 'ext/skia_sandbox_support_win.h', 'ext/skia_sandbox_support_win.cc', 'ext/skia_trace_shim.h', + 'ext/skia_utils_base.cc', + 'ext/skia_utils_base.h', 'ext/skia_utils_ios.mm', 'ext/skia_utils_ios.h', 'ext/skia_utils_mac.mm', @@ -375,8 +377,11 @@ '-Wno-unused-function', ], 'sources': [ - 'ext/SkFontHost_fontconfig.cpp', - 'ext/SkFontHost_fontconfig_direct.cpp', + '../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', |