From cbb3909f9ce4996970841f17ef50f15176ded68c Mon Sep 17 00:00:00 2001
From: "robertphillips@google.com"
 <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 24 Jan 2013 14:49:01 +0000
Subject: 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
---
 DEPS          | 2 +-
 skia/skia.gyp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index ff4b5cd..cf441da 100644
--- a/DEPS
+++ b/DEPS
@@ -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',
-- 
cgit v1.1