summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrolandsteiner@chromium.org <rolandsteiner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-01 08:04:44 +0000
committerrolandsteiner@chromium.org <rolandsteiner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-01 08:04:44 +0000
commit8204cf888ad88deeab40f69dcc23c1c1c02d6fc1 (patch)
treef72a1c54462c4fe2f00a54f8b665b4c535503d3c
parent4b0351abf8c8a767132670994a85d46f0435af1e (diff)
downloadchromium_src-8204cf888ad88deeab40f69dcc23c1c1c02d6fc1.zip
chromium_src-8204cf888ad88deeab40f69dcc23c1c1c02d6fc1.tar.gz
chromium_src-8204cf888ad88deeab40f69dcc23c1c1c02d6fc1.tar.bz2
Experimental WebKit roll 71000:71013 Also, remove lines from test_expectations.txt after upstreaming
BUG=none TEST=none TBR=dimich git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64582 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt7
2 files changed, 1 insertions, 8 deletions
diff --git a/DEPS b/DEPS
index 6e0f462..ead1c68 100644
--- a/DEPS
+++ b/DEPS
@@ -4,7 +4,7 @@ vars = {
"googlecode_url": "http://%s.googlecode.com/svn",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "71000",
+ "webkit_revision": "71013",
"skia_revision": "621",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "40423",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index a1797c4..1182525 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -18,10 +18,3 @@ BUGDIMICH MAC : fast/images/svg-as-background.html = CRASH
BUG60651 : fast/canvas/webgl/gl-object-get-calls.html = TIMEOUT FAIL
BUG60651 : fast/canvas/webgl/glsl-conformance.html = TIMEOUT FAIL
BUG60671 : fast/canvas/webgl/uniform-location.html = TIMEOUT FAIL CRASH
-
-// Failures after WebKit roll 70949:71000
-BUG61406 : svg/dynamic-updates/SVGFEColorMatrixElement-svgdom-values-prop.html = IMAGE+TEXT
-BUG61406 : svg/dynamic-updates/SVGFEColorMatrixElement-svgdom-type-prop.html = IMAGE
-BUG61406 : svg/dynamic-updates/SVGFETurbulenceElement-svgdom-baseFrequency-prop.html = IMAGE
-BUG61406 : svg/dynamic-updates/SVGTextElement-svgdom-rotate-prop.html = IMAGE
-BUGWK71000 MAC : canvas/philip/tests/2d.imageData.get.source.negative.html = TEXT