summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-07 13:40:21 +0000
committerrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-07 13:40:21 +0000
commitd16f14cffbae9d2774349128b6aa8f2386ecff52 (patch)
tree4f377966710323a9e79845f55f13248f820971fe
parent46982adf354163486c04b1ae6737b41dfe3490e7 (diff)
downloadchromium_src-d16f14cffbae9d2774349128b6aa8f2386ecff52.zip
chromium_src-d16f14cffbae9d2774349128b6aa8f2386ecff52.tar.gz
chromium_src-d16f14cffbae9d2774349128b6aa8f2386ecff52.tar.bz2
Roll Skia DEPS to r7044 & add SK_IGNORE_TRANS_CLAMP_FIX and SK_IGNORE_FAST_SCALEMATRIX_INVERT
control: https://codereview.chromium.org/11791014/ Review URL: https://codereview.chromium.org/11779016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175328 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--skia/skia.gyp2
2 files changed, 3 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 3dcaece..8e128c0 100644
--- a/DEPS
+++ b/DEPS
@@ -29,7 +29,7 @@ vars = {
"ffmpeg_hash": "0c981b3a572f9257e6178f5572e3f3cd47ac3025",
"sfntly_revision": "134",
- "skia_revision": "7006",
+ "skia_revision": "7044",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and V8 without interference from each other.
diff --git a/skia/skia.gyp b/skia/skia.gyp
index e55db05..bc6025a 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -233,6 +233,8 @@
'SK_SUPPORT_INT_SRCRECT_DRAWBITMAPRECT',
'SK_IGNORE_QUAD_STROKE_FIX',
'SK_IGNORE_TREAT_AS_SPRITE',
+ 'SK_IGNORE_TRANS_CLAMP_FIX',
+ 'SK_IGNORE_FAST_SCALEMATRIX_INVERT',
],
'sources!': [
'../third_party/skia/include/core/SkTypes.h',