summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index a86b861..7fbb46f 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "51042",
+ "webkit_revision": "51062",
"ffmpeg_revision": "30374",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 91dde20..e76bd64 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3070,3 +3070,6 @@ BUGYAAR WIN LINUX : LayoutTests/fast/overflow/line-clamp.html = IMAGE+TEXT
BUGYAAR MAC : LayoutTests/fast/overflow/line-clamp.html = IMAGE
BUG27850 : LayoutTests/fast/history/back-forward-reset-after-error-handling.html = TEXT
BUG27849 : LayoutTests/http/tests/security/isolatedWorld/didClearWindowObject.html = TEXT
+
+// Failures from merge 51042:51062
+BUG27923: LayoutTests/accessibility/aria-labelledby-overrides-label.html = TEXT