summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--skia/skia.gyp1
-rw-r--r--skia/skia_test_expectations.txt10
3 files changed, 12 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 1b157cb..36ed6a7 100644
--- a/DEPS
+++ b/DEPS
@@ -29,7 +29,7 @@ vars = {
"ffmpeg_hash": "245a8c0cdfdd5ab3da9045089661017e9ddd8d0e",
"sfntly_revision": "134",
- "skia_revision": "9926",
+ "skia_revision": "9949",
# 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 71f41c2..1844de4 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -685,6 +685,7 @@
'../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp',
+ '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp',
'ext/convolver_SSE2.cc',
],
'conditions': [
diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt
index 4327f6e..559db8c 100644
--- a/skia/skia_test_expectations.txt
+++ b/skia/skia_test_expectations.txt
@@ -48,4 +48,14 @@
#
# START OVERRIDES HERE
+# r9928 fixed arc end capping but caused some minor image differences
+# in the following 6 layout tests
+crbug.com/258850 svg/W3C-SVG-1.1/paths-data-10-t.svg [ ImageOnlyFailure ]
+crbug.com/258850 svg/W3C-SVG-1.1/struct-group-03-t.svg [ ImageOnlyFailure ]
+crbug.com/258850 svg/as-background-image/svg-as-background-6.html [ ImageOnlyFailure ]
+crbug.com/258850 svg/custom/marker-opacity.svg [ ImageOnlyFailure ]
+
+crbug.com/258850 svg/batik/text/smallFonts.svg [ ImageOnlyFailure ]
+crbug.com/258850 svg/batik/text/textFeatures.svg [ ImageOnlyFailure ]
+
# END OVERRIDES HERE (this line ensures that the file is newline-terminated)