diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 14:01:42 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 14:01:42 +0000 |
| commit | 4d8d416342d800b521de82669f814b3f9494e18c (patch) | |
| tree | ab58844a348a8f49968bdbcc97a07065fd773ac8 | |
| parent | 4d8786aaea710a9fffa6e5bcf86e9556f70d251d (diff) | |
| download | chromium_src-4d8d416342d800b521de82669f814b3f9494e18c.zip chromium_src-4d8d416342d800b521de82669f814b3f9494e18c.tar.gz chromium_src-4d8d416342d800b521de82669f814b3f9494e18c.tar.bz2 | |
Roll Skia DEPS to r7785
control: https://codereview.chromium.org/12296041/
Review URL: https://codereview.chromium.org/12282050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183517 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -29,7 +29,7 @@ vars = { "ffmpeg_hash": "bb82a38d45e65c1fba378c15180b98ad76ebe1ca", "sfntly_revision": "134", - "skia_revision": "7767", + "skia_revision": "7785", # 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 340da93..0bf1e97 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -231,6 +231,7 @@ # SkGraphics::Init(). 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0', + 'SK_DISABLE_BLUR_ROUNDING', # Disable this check because it is too strict for some Chromium-specific # subclasses of SkPixelRef. See bug: crbug.com/171776. |