diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 14:49:01 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 14:49:01 +0000 |
| commit | cbb3909f9ce4996970841f17ef50f15176ded68c (patch) | |
| tree | 3e2b41e682208260f6a5bf6b45053ab6de36f30b | |
| parent | 00322d5155d2a6a1abd5506bcb8231335525c1c8 (diff) | |
| download | chromium_src-cbb3909f9ce4996970841f17ef50f15176ded68c.zip chromium_src-cbb3909f9ce4996970841f17ef50f15176ded68c.tar.gz chromium_src-cbb3909f9ce4996970841f17ef50f15176ded68c.tar.bz2 | |
Roll Skia DEPS to r7355
control: https://codereview.chromium.org/12052054/
Review URL: https://codereview.chromium.org/12035066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178573 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": "fe7d5497f1490914d7c3bb0236a1c722afccf4e4", "sfntly_revision": "134", - "skia_revision": "7329", + "skia_revision": "7355", # 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 12fbb67..8a56009 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -231,6 +231,7 @@ 'SK_IGNORE_1XN_BITMAP_OPT', 'SK_IGNORE_CLIP_BUG_FIX', + 'SK_IGNORE_CONVEX_QUAD_OPT', ], 'sources!': [ '../third_party/skia/include/core/SkTypes.h', |