summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-04 20:56:30 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-04 20:56:30 +0000
commitd7c934417b3757d56d32a727fb84351178b515dd (patch)
tree4e0dceadf4295788a0465998a77d24c650cd8447
parent61b94be8ae1a51837dba6cbc6c8f8924c52bb904 (diff)
downloadchromium_src-d7c934417b3757d56d32a727fb84351178b515dd.zip
chromium_src-d7c934417b3757d56d32a727fb84351178b515dd.tar.gz
chromium_src-d7c934417b3757d56d32a727fb84351178b515dd.tar.bz2
Roll WebKit 50487:50516
Also added test expectations for the ruby tests. They need to be rebaselined afterwards. TBR=brettw TEST=Tree stays green Review URL: http://codereview.chromium.org/366006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30996 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt19
2 files changed, 20 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index b2c7ef2..5413940 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "50487",
+ "webkit_revision": "50516",
"ffmpeg_revision": "30374",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 4b05a09..fffc2a9 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3299,3 +3299,22 @@ BUG_SENORBLANCO WIN : LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f.svg = IMAGE
// Started failing on Win, Linux after Webkit 50476:50480, probably 50477
BUG10442 WIN LINUX : LayoutTests/fast/dom/navigator-detached-no-crash.html = TEXT
+
+// WebKit 50487:50516
+// The following tests need rebaseline.
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/ruby-empty-rt.html = FAIL
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/ruby-length.html = FAIL
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/ruby-run-break.html = FAIL
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/ruby-runs-spans.html = FAIL
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/ruby-runs.html = FAIL
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/ruby-simple-rp.html = FAIL
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/ruby-simple.html = FAIL
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/ruby-trailing.html = FAIL
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/rubyDOM-insert-rt.html = FAIL
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/rubyDOM-insert-text1.html = FAIL
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/rubyDOM-insert-text2.html = FAIL
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/rubyDOM-insert-text3.html = FAIL
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/rubyDOM-remove-rt1.html = FAIL
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/rubyDOM-remove-rt2.html = FAIL
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/rubyDOM-remove-text1.html = FAIL
+BUG_HCLAM WIN LINUX : LayoutTests/fast/ruby/rubyDOM-remove-text2.html = FAIL