diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 16:27:46 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 16:27:46 +0000 |
commit | 7f8d362ec211a82f4e18b3bca74dec29b888ffa2 (patch) | |
tree | 28194e5a0eeb9b71e5bad9d987c080987998812f | |
parent | 19e1200e9b2dc55b8b620ae9eeaff025828277ad (diff) | |
download | chromium_src-7f8d362ec211a82f4e18b3bca74dec29b888ffa2.zip chromium_src-7f8d362ec211a82f4e18b3bca74dec29b888ffa2.tar.gz chromium_src-7f8d362ec211a82f4e18b3bca74dec29b888ffa2.tar.bz2 |
Update WebKit to r48354
This meant picking up some failing tests.
TBR=brettw
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/196107
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26110 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | DEPS | 2 | ||||
-rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 7 |
2 files changed, 8 insertions, 1 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "48313", + "webkit_revision": "48354", } deps = { diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 08094a6..83aea4e 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2328,3 +2328,10 @@ BUG21644 : LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main- BUG21644 : LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame.html = FAIL BUG21644 : LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html = FAIL BUG21644 : LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html = FAIL + +// New test added in r48318 (GoogleURL bug) +BUG21764 : LayoutTests/fast/forms/ValidityState-typeMismatch-url.html = FAIL + +// New test added in r48336 (V8 bug) +BUG21767 : LayoutTests/fast/js/Object-keys.html = FAIL +BUG21767 : LayoutTests/http/tests/security/cross-frame-access-enumeration.html = TIMEOUT |