summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-12 11:50:13 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-12 11:50:13 +0000
commit7f55b32fd9a23a3ffd7433c1d3f10932bffe5657 (patch)
tree3fcc7be29fefe00d6bc016e824983a0e305b58aa /skia
parentbd1fd81461238c89a9a452d71143f457ff0fe840 (diff)
downloadchromium_src-7f55b32fd9a23a3ffd7433c1d3f10932bffe5657.zip
chromium_src-7f55b32fd9a23a3ffd7433c1d3f10932bffe5657.tar.gz
chromium_src-7f55b32fd9a23a3ffd7433c1d3f10932bffe5657.tar.bz2
roll skia to 2455, and add SkAAClip and SkRasterClip to the gyp
Review URL: http://codereview.chromium.org/8232011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105058 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/skia.gyp3
1 files changed, 2 insertions, 1 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp
index ff59f52..233053b 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -280,6 +280,7 @@
'../third_party/skia/src/core/ARGB32_Clamp_Bilinear_BitmapShader.h',
'../third_party/skia/src/core/Sk64.cpp',
+ '../third_party/skia/src/core/SkAAClip.cpp',
'../third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp',
'../third_party/skia/src/core/SkAlphaRuns.cpp',
'../third_party/skia/src/core/SkAntiRun.h',
@@ -379,6 +380,7 @@
'../third_party/skia/src/core/SkPtrRecorder.cpp',
'../third_party/skia/src/core/SkQuadClipper.cpp',
'../third_party/skia/src/core/SkQuadClipper.h',
+ '../third_party/skia/src/core/SkRasterClip.cpp',
'../third_party/skia/src/core/SkRasterizer.cpp',
'../third_party/skia/src/core/SkRect.cpp',
'../third_party/skia/src/core/SkRefDict.cpp',
@@ -828,7 +830,6 @@
},
{ # use_skia
'defines': [
- 'SK_SUPPORT_888_TEXT',
'SK_USE_MAC_CORE_TEXT',
],
}],