diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 17:31:04 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 17:31:04 +0000 |
| commit | df42142c7a499aa38b08f20a4995bad52a6e9a3c (patch) | |
| tree | e26d0128509c5946c78ee4d3027d2b37fe906b01 | |
| parent | 704adb663cfc941fcee663fde3c1c059a24061c6 (diff) | |
| download | chromium_src-df42142c7a499aa38b08f20a4995bad52a6e9a3c.zip chromium_src-df42142c7a499aa38b08f20a4995bad52a6e9a3c.tar.gz chromium_src-df42142c7a499aa38b08f20a4995bad52a6e9a3c.tar.bz2 | |
Rerolling Skia DEPS since the failing bot cycled green (before reaching the revert)
Revert 170460 - Revert 170448 - Roll Skia DEPS to r6630
Getting FATAL:image_skia.cc(388)] Check failed: CanRead() in EnableAppModeTest
control: https://codereview.chromium.org/11419241/
Review URL: https://codereview.chromium.org/11416276
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/11416284
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/11418258
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170472 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": "82ae69cc47f25f9a59cf2ca8742e3391c34e7602", "sfntly_revision": "134", - "skia_revision": "6593", + "skia_revision": "6630", # 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 6c11f07..0decae1 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -236,6 +236,7 @@ 'SK_DISABLE_DITHER_32BIT_GRADIENT', 'SK_DISABLE_DASHING_OPTIMIZATION', + 'SK_DISABLE_SEPARABLE_MASK_BLUR', ], 'sources!': [ '../third_party/skia/include/core/SkTypes.h', |