summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--skia/skia.gyp5
2 files changed, 3 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index f0de9f5..423b2ee 100644
--- a/DEPS
+++ b/DEPS
@@ -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@293",
+ "http://skia.googlecode.com/svn/trunk@250",
"src/third_party/WebKit/LayoutTests":
Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"),
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 9c33f6a..3255ca4 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -188,6 +188,8 @@
'../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',
@@ -591,9 +593,6 @@
'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',