diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-11 12:46:55 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-11 12:46:55 +0000 |
| commit | a5fda2a512b1f0f56185b2e9426e41b0db6d2e4d (patch) | |
| tree | 15af59b9976f95dc54b7c8362f2c67f562493b26 /skia/skia.gyp | |
| parent | a7f3f9e0aef54d55fbcd6d601f351d1e90e8b902 (diff) | |
| download | chromium_src-a5fda2a512b1f0f56185b2e9426e41b0db6d2e4d.zip chromium_src-a5fda2a512b1f0f56185b2e9426e41b0db6d2e4d.tar.gz chromium_src-a5fda2a512b1f0f56185b2e9426e41b0db6d2e4d.tar.bz2 | |
Call version of SkFontHost_fontconfig in Skia (cloned from here).
Retool the direct/remove plumbing to use SkFontConfigInterface.
This change allows Skia to interate on the details of SkFontHost w/o having
to synchromize with chrome on each change. It also means Skia's internal testing
can exercise exactly the same config that Chrome does.
Review URL: https://codereview.chromium.org/12391070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187283 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 340e64e0..71b34f2 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', @@ -374,8 +376,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', |