summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-07 14:19:39 +0000
committerrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-07 14:19:39 +0000
commit86f5e927f1f6117b0c426c601b151907f8ebac8f (patch)
tree44a03bf6c633104391eed58acb7b9c723101ad7b
parent4b7a8f5b6ac82cfe52054be7eec350bdfde41688 (diff)
downloadchromium_src-86f5e927f1f6117b0c426c601b151907f8ebac8f.zip
chromium_src-86f5e927f1f6117b0c426c601b151907f8ebac8f.tar.gz
chromium_src-86f5e927f1f6117b0c426c601b151907f8ebac8f.tar.bz2
Revert 175328
> 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 TBR=robertphillips@google.com Review URL: https://codereview.chromium.org/11784021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175330 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--skia/skia.gyp2
2 files changed, 1 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 8e128c0..3dcaece 100644
--- a/DEPS
+++ b/DEPS
@@ -29,7 +29,7 @@ vars = {
"ffmpeg_hash": "0c981b3a572f9257e6178f5572e3f3cd47ac3025",
"sfntly_revision": "134",
- "skia_revision": "7044",
+ "skia_revision": "7006",
# 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 bc6025a..e55db05 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -233,8 +233,6 @@
'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',