summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 19:58:10 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 19:58:10 +0000
commit4e81fa02cf409ac38962dad4e42b01cd0c882bcf (patch)
tree4d6a3b34aa6da6551e5288aff51290f38c978c49
parentd65a397bb61c601ec48fea1d4e9e03637858b9e4 (diff)
downloadchromium_src-4e81fa02cf409ac38962dad4e42b01cd0c882bcf.zip
chromium_src-4e81fa02cf409ac38962dad4e42b01cd0c882bcf.tar.gz
chromium_src-4e81fa02cf409ac38962dad4e42b01cd0c882bcf.tar.bz2
Roll Skia forward to r524.
My target is farther than that, but I'm doing this incrementally. Review URL: http://codereview.chromium.org/1752003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45223 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
2 files changed, 5 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 59fe0af..13592ee 100644
--- a/DEPS
+++ b/DEPS
@@ -3,7 +3,7 @@ vars = {
"http://svn.webkit.org/repository/webkit/trunk",
"webkit_revision": "57959",
"ffmpeg_revision": "43776",
- "skia_revision": "504",
+ "skia_revision": "524",
"chromium_git": "http://src.chromium.org/git",
"swig_revision": "40423",
"nacl_revision": "2072",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 1d56413..f4dbfe3 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -16,3 +16,7 @@ BUG39855 SLOW DEBUG : editing/selection/extend-selection.html = PASS
// Failing a few times, flak dashboard seems to agree.
BUG41973 MAC : svg/text/text-text-05-t.svg = IMAGE
+
+// Rolling Skia forward in Chrome tree to get new baselines to check
+// in upstream.
+BUGEVAN : svg/clip-path/clip-path-child-clipped.svg = PASS FAIL