diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 22:03:02 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 22:03:02 +0000 |
| commit | 8c0bcc1669a718e88877104afe194963f3eb1380 (patch) | |
| tree | d0a7644c9dc9fb72dad0b98a745fc89ad3016ab2 | |
| parent | 8d5cf8b92faa778cbde594a436e7d0e5218ea19b (diff) | |
| download | chromium_src-8c0bcc1669a718e88877104afe194963f3eb1380.zip chromium_src-8c0bcc1669a718e88877104afe194963f3eb1380.tar.gz chromium_src-8c0bcc1669a718e88877104afe194963f3eb1380.tar.bz2 | |
Skia merge 279:284
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21332 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -41,7 +41,7 @@ deps = { "http://nativeclient.googlecode.com/svn/trunk/src/native_client@385", "src/third_party/skia": - "http://skia.googlecode.com/svn/trunk@279", + "http://skia.googlecode.com/svn/trunk@284", "src/third_party/WebKit/LayoutTests": Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"), diff --git a/skia/skia.gyp b/skia/skia.gyp index 559c90c..9c33f6a 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -600,7 +600,7 @@ '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz_interface', ], 'defines': [ - 'SK_BUILD_SUBPIXEL', + 'SK_SUPPORT_LCDTEXT', ], }], [ 'OS == "mac"', { |