summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 06:16:55 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 06:16:55 +0000
commit181e8e437290e50c630b9c4feb3d53e0b10c2d83 (patch)
tree84d3742e4be77d389b9e050632e1c86193cd10d2
parent5924beea7a8ecc73baecf3e8fcbbbb491e376f01 (diff)
downloadchromium_src-181e8e437290e50c630b9c4feb3d53e0b10c2d83.zip
chromium_src-181e8e437290e50c630b9c4feb3d53e0b10c2d83.tar.gz
chromium_src-181e8e437290e50c630b9c4feb3d53e0b10c2d83.tar.bz2
WebKit merge 47759:47770.
TEST=None BUG=None Review URL: http://codereview.chromium.org/173459 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24435 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt5
2 files changed, 6 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 387f184..8863b77 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "47759",
+ "webkit_revision": "47770",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index a24b072..ceed064 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2515,6 +2515,7 @@ BUG17585 : LayoutTests/fast/dom/HTMLDataGridElement/DataGridDataSource-basic.htm
// Disabling since try bots use Chromium FFmpeg DLLs, which means we can no
// longer decode WebKit's test clips because they use H.264, AAC, etc.
+BUG16779 SKIP : LayoutTests/accessibility/media-element.html = TIMEOUT
BUG16779 SKIP : LayoutTests/media/audio-constructor-autobuffer.html = FAIL TIMEOUT
BUG16779 SKIP : LayoutTests/media/audio-delete-while-slider-thumb-clicked.html = TIMEOUT
BUG16779 SKIP : LayoutTests/media/audio-delete-while-step-button-clicked.html = TIMEOUT
@@ -2831,3 +2832,7 @@ BUG20265 LINUX : LayoutTests/fast/forms/ValidityState-valueMissing-005.html = CR
BUG20265 LINUX : LayoutTests/fast/forms/range-default-value.html = CRASH
BUG20265 LINUX : LayoutTests/fast/forms/range-reset.html = CRASH
BUG20265 LINUX : LayoutTests/platform/mac/accessibility/slider-supports-actions.html = CRASH
+
+// WebKit 47759:47770.
+BUG20292 : LayoutTests/fast/forms/input-list.html = FAIL
+BUG20292 : LayoutTests/fast/forms/input-selectedoption.html = FAIL