diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-11 13:36:35 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-11 13:36:35 +0000 |
| commit | c7f723c82709ca3b09d4711be191ca762550eab4 (patch) | |
| tree | a8d8bc2772f7b39be15349e722931f95f720acbd /skia/skia.gyp | |
| parent | a5fda2a512b1f0f56185b2e9426e41b0db6d2e4d (diff) | |
| download | chromium_src-c7f723c82709ca3b09d4711be191ca762550eab4.zip chromium_src-c7f723c82709ca3b09d4711be191ca762550eab4.tar.gz chromium_src-c7f723c82709ca3b09d4711be191ca762550eab4.tar.bz2 | |
Revert 187283
memcheck reported errors which need to be investigated
> 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
TBR=reed@google.com
Review URL: https://codereview.chromium.org/12771003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 71b34f2..340e64e0 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -182,8 +182,6 @@ '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', @@ -376,11 +374,8 @@ '-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', + 'ext/SkFontHost_fontconfig.cpp', + 'ext/SkFontHost_fontconfig_direct.cpp', ], 'defines': [ # 'SK_USE_COLOR_LUMINANCE', |