summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-25 00:25:12 +0000
committerjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-25 00:25:12 +0000
commita6dbdf7b66a75fc30de5fec8c6057cc32e7908f3 (patch)
tree0f4a37cd73225e391cc3c8b6bb4aa8e19adb5b3b
parentb67954bed772b0d67ddcf2424ac5d47f43cbf3f8 (diff)
downloadchromium_src-a6dbdf7b66a75fc30de5fec8c6057cc32e7908f3.zip
chromium_src-a6dbdf7b66a75fc30de5fec8c6057cc32e7908f3.tar.gz
chromium_src-a6dbdf7b66a75fc30de5fec8c6057cc32e7908f3.tar.bz2
WebKit merge 47719:47732
BUG=none TEST=none Review URL: http://codereview.chromium.org/173312 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24190 0039d316-1c4b-4281-b951-d872f2087c98
-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 03bf7cc..03f7c1c 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "47719",
+ "webkit_revision": "47732",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 5557969..7e71ff5 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2828,3 +2828,6 @@ BUG_JIANLI WIN LINUX SKIP : LayoutTests/fast/forms/textarea-placeholder-set-valu
// WebKit 47646:47719.
BUG_JIANLI MAC : LayoutTests/fast/forms/button-state-restore.html = CRASH
+
+// WebKit 47719:47732. New test. Time out on all 3 platforms.
+BUG_JIANLI : LayoutTests/loader/go-back-to-different-window-size.html = TIMEOUT