summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-20 18:58:40 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-20 18:58:40 +0000
commit3fee752c1de81cf55fabcd2164258113bfd818d8 (patch)
tree844540c9b707b8c76d0aa3656b050a6123a1106f /webkit/tools
parent1c07511de3b12813e143f3ca090096991414008d (diff)
downloadchromium_src-3fee752c1de81cf55fabcd2164258113bfd818d8.zip
chromium_src-3fee752c1de81cf55fabcd2164258113bfd818d8.tar.gz
chromium_src-3fee752c1de81cf55fabcd2164258113bfd818d8.tar.bz2
Chrome side of WebKit merge to 41860.
Update some layout tests and roll deps. Review URL: http://codereview.chromium.org/42454 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12203 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 0c05c02..6ccb2c9 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1881,3 +1881,7 @@ LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-post.html = CRASH
// Regression
LayoutTests/http/tests/security/cross-frame-access-history-put.html = FAIL
MAC : LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-denied-events-post.html = TIMEOUT
+
+// Merge 41827:41860 Regressions
+// Upstream r41849 added a large regex to this test which times out in V8.
+LayoutTests/fast/js/regexp-overflow.html = TIMEOUT