summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--skia/skia.gyp1
2 files changed, 2 insertions, 1 deletions
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',