summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 12:14:19 +0000
committerrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 12:14:19 +0000
commitf3b82af1fa8600643f3cf5975a1a1f7913430b91 (patch)
tree186a17532f8e3a056ab6a4be58141fa325206fea
parentd12c14ba3e12f7a8924501bbcd6ce768096b518b (diff)
downloadchromium_src-f3b82af1fa8600643f3cf5975a1a1f7913430b91.zip
chromium_src-f3b82af1fa8600643f3cf5975a1a1f7913430b91.tar.gz
chromium_src-f3b82af1fa8600643f3cf5975a1a1f7913430b91.tar.bz2
Roll Skia DEPS to r9003
R=reed@google.com Review URL: https://codereview.chromium.org/14976002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198420 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 883f84b3a..ee82c3d 100644
--- a/DEPS
+++ b/DEPS
@@ -29,7 +29,7 @@ vars = {
"ffmpeg_hash": "cc796f43aa0528f3d10bc853cc52af30acab618c",
"sfntly_revision": "134",
- "skia_revision": "8974",
+ "skia_revision": "9003",
# 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 d6acca5..63ab069 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -244,6 +244,8 @@
# Disable this check because it is too strict for some Chromium-specific
# subclasses of SkPixelRef. See bug: crbug.com/171776.
'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK',
+
+ 'IGNORE_ROT_AA_RECT_OPT',
],
'sources!': [
'../third_party/skia/include/core/SkTypes.h',