summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--skia/skia.gyp4
2 files changed, 4 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 99eda7d..fa9c0c7 100644
--- a/DEPS
+++ b/DEPS
@@ -36,7 +36,7 @@ vars = {
"lss_revision": "9",
"ffmpeg_revision": "117977",
"sfntly_revision": "118",
- "skia_revision": "3039",
+ "skia_revision": "3061",
# 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 49476bd..f29de35 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -344,7 +344,9 @@
'../third_party/skia/src/gpu/GrAAHairLinePathRenderer.cpp',
'../third_party/skia/src/gpu/GrAAHairLinePathRenderer.h',
- '../third_party/skia/src/gpu/GrAddPathRenderers_aahairline.cpp',
+ '../third_party/skia/src/gpu/GrAAConvexPathRenderer.cpp',
+ '../third_party/skia/src/gpu/GrAAConvexPathRenderer.h',
+ '../third_party/skia/src/gpu/GrAddPathRenderers_default.cpp',
'../third_party/skia/src/gpu/GrAllocator.h',
'../third_party/skia/src/gpu/GrAllocPool.h',
'../third_party/skia/src/gpu/GrAllocPool.cpp',