summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-05 00:54:06 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-05 00:54:06 +0000
commit92f181bdad8897a5891d6a67a7aa5de7caa8402c (patch)
treea9267005f98d1c9e97a482f81b3091283d370af6
parent76361d0b2bf453fd6a47f16fb7c765e0ece103b4 (diff)
downloadchromium_src-92f181bdad8897a5891d6a67a7aa5de7caa8402c.zip
chromium_src-92f181bdad8897a5891d6a67a7aa5de7caa8402c.tar.gz
chromium_src-92f181bdad8897a5891d6a67a7aa5de7caa8402c.tar.bz2
WebKit merge 50516:50527
TBR=brettw TEST=tree stays green Also add a fail expectation for a new test so we can capture it's baseline later. Review URL: http://codereview.chromium.org/363013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31048 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
2 files changed, 6 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index b93bc6e..61580ee 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "50516",
+ "webkit_revision": "50527",
"ffmpeg_revision": "30374",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index e7c3a67..b1404c8 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3253,4 +3253,8 @@ BUG_SENORBLANCO LINUX DEBUG : LayoutTests/webarchive/test-duplicate-resources.ht
BUG_SENORBLANCO : LayoutTests/accessibility/aria-controls-with-tabs.html = TEXT
BUG_SENORBLANCO : LayoutTests/accessibility/aria-tab-roles.html = TEXT
BUG_SENORBLANCO LINUX WIN : LayoutTests/svg/css/circle-in-mask-with-shadow.svg = IMAGE
-BUG_SENORBLANCO WIN : LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f.svg = IMAGE \ No newline at end of file
+BUG_SENORBLANCO WIN : LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f.svg = IMAGE
+
+// WebKit 50517:50527
+// This is a new test, just need rebaselining.
+BUG_HCLAM : LayoutTests/accessibility/aria-combobox.html = TEXT