diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 12:26:53 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 12:26:53 +0000 |
| commit | 6d3937e5bf911d2a9a781a28acbfa1dd06c2713f (patch) | |
| tree | 4735c0ec3888b762f3fce1e80ed2c4fba08a08bd | |
| parent | 637db3b5716d81579e3dd5abc0e842cd64fdcc7d (diff) | |
| download | chromium_src-6d3937e5bf911d2a9a781a28acbfa1dd06c2713f.zip chromium_src-6d3937e5bf911d2a9a781a28acbfa1dd06c2713f.tar.gz chromium_src-6d3937e5bf911d2a9a781a28acbfa1dd06c2713f.tar.bz2 | |
roll skia to 1906
Review URL: http://codereview.chromium.org/7448010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93184 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -21,7 +21,7 @@ vars = { "libjingle_revision": "73", "libvpx_revision": "90416", "ffmpeg_revision": "91042", - "skia_revision": "1900", + "skia_revision": "1906", "v8_revision": "8670", "webrtc_revision": "232", } diff --git a/skia/skia.gyp b/skia/skia.gyp index a4b53af..4a9958f 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -719,6 +719,7 @@ 'GR_AGGRESSIVE_SHADER_OPTS=1', 'SK_DISABLE_FAST_AA_STROKE_RECT', 'SK_IGNORE_CF_OPTIMIZATION', + 'SK_DISABLE_GPU_BLUR', ], 'sources!': [ '../third_party/skia/include/core/SkTypes.h', |