diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 20:44:39 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 20:44:39 +0000 |
| commit | 0c3de092db615b7b9935c9c277406b0789c88221 (patch) | |
| tree | 1440c4feb9f96d66d57275aee2a47c85796e037a /skia | |
| parent | 3cead8b0c7980c23171a569ee10b2b9835e4b941 (diff) | |
| download | chromium_src-0c3de092db615b7b9935c9c277406b0789c88221.zip chromium_src-0c3de092db615b7b9935c9c277406b0789c88221.tar.gz chromium_src-0c3de092db615b7b9935c9c277406b0789c88221.tar.bz2 | |
This enables the Windows and Mac font host, and disables the fake font host that Chrome currently uses. This will be necessary to integrate O3D into Chrome, since we use Skia to render text in our canvas.
TEST=run chrome with canvas drawing text
BUG=none
Review URL: http://codereview.chromium.org/150175
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 6402147..ead7cfd 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -363,9 +363,9 @@ #'../third_party/skia/src/ports/SkFontHost_gamma.cpp', '../third_party/skia/src/ports/SkFontHost_gamma_none.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', - #'../third_party/skia/src/ports/SkFontHost_win.cpp', + '../third_party/skia/src/ports/SkFontHost_mac.cpp', + #'../third_party/skia/src/ports/SkFontHost_none.cpp', + '../third_party/skia/src/ports/SkFontHost_win.cpp', '../third_party/skia/src/ports/SkGlobals_global.cpp', #'../third_party/skia/src/ports/SkImageDecoder_CG.cpp', #'../third_party/skia/src/ports/SkImageDecoder_empty.cpp', @@ -523,7 +523,6 @@ 'ext/platform_device_win.cc', 'ext/platform_device_win.h', 'ext/SkMemory_new_handler.cpp', - 'ext/SkTypeface_fake.cpp', 'ext/skia_utils.cc', 'ext/skia_utils.h', 'ext/skia_utils_mac.mm', @@ -568,7 +567,6 @@ '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', '../third_party/skia/src/ports/SkFontHost_tables.cpp', - '../third_party/skia/src/core/SkTypeface.cpp', ], }], [ 'OS != "win"', { @@ -590,10 +588,6 @@ '-Wno-unused', '-Wno-unused-function', ], - 'sources!': [ - '../third_party/skia/src/ports/SkFontHost_none.cpp', - 'ext/SkTypeface_fake.cpp', - ], 'sources': [ # http://code.google.com/p/chromium/wiki/LinuxSandboxIPC 'ext/SkFontHost_fontconfig.cpp', |