diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 15:42:13 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 15:42:13 +0000 |
| commit | 8b35a84335ef7402cddc09446127b8721d65fc61 (patch) | |
| tree | dc58d539618b61c8b7f513737a13775f1022a8de | |
| parent | 04870625cb2918e19f0cf1e8a864cce853dbcbde (diff) | |
| download | chromium_src-8b35a84335ef7402cddc09446127b8721d65fc61.zip chromium_src-8b35a84335ef7402cddc09446127b8721d65fc61.tar.gz chromium_src-8b35a84335ef7402cddc09446127b8721d65fc61.tar.bz2 | |
Revert r22266.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22268 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 5 |
2 files changed, 4 insertions, 3 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@250", + "http://skia.googlecode.com/svn/trunk@293", "src/third_party/WebKit/LayoutTests": Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"), diff --git a/skia/skia.gyp b/skia/skia.gyp index 3255ca4..9c33f6a 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -188,8 +188,6 @@ '../third_party/skia/src/core/SkBitmapSampler.cpp', '../third_party/skia/src/core/SkBitmapSampler.h', '../third_party/skia/src/core/SkBitmapSamplerTemplate.h', - '../third_party/skia/src/core/SkBitmapShader.cpp', - '../third_party/skia/src/core/SkBitmapShader.h', '../third_party/skia/src/core/SkBitmapShader16BilerpTemplate.h', '../third_party/skia/src/core/SkBitmapShaderTemplate.h', '../third_party/skia/src/core/SkBitmap_scroll.cpp', @@ -593,6 +591,9 @@ 'ext/SkFontHost_fontconfig.cpp', 'ext/SkFontHost_fontconfig_direct.cpp', 'ext/SkFontHost_fontconfig_ipc.cpp', + '../third_party/skia/src/core/SkBlitter_ARGB32_Subpixel.cpp', + '../third_party/skia/src/ports/SkFontHost_FreeType_Subpixel.cpp', + '../third_party/skia/src/core/SkFontHost.cpp', ], 'export_dependent_settings': [ '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz', |