summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-10 14:44:16 +0000
committerrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-10 14:44:16 +0000
commit87f453f0b4247e7d46a552a439c7ed469a5703eb (patch)
treeabacf5cef3752ede131500bddab57409ea376dfb /skia
parent37fa3b6230a33ab71dd3e134606ac97813bd82b5 (diff)
downloadchromium_src-87f453f0b4247e7d46a552a439c7ed469a5703eb.zip
chromium_src-87f453f0b4247e7d46a552a439c7ed469a5703eb.tar.gz
chromium_src-87f453f0b4247e7d46a552a439c7ed469a5703eb.tar.bz2
Roll Skia DEPS to r9949
R=bsalomon@google.com Review URL: https://codereview.chromium.org/18804003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/skia.gyp1
-rw-r--r--skia/skia_test_expectations.txt10
2 files changed, 11 insertions, 0 deletions
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)