summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-11 23:24:30 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-11 23:24:30 +0000
commit8fe04e160b1c67ed432f9d2aa5e9a987055a4b22 (patch)
treee937f3b44a6cdcea2286840b32bdb51b4ab0a51e /webkit/tools
parent128c647bc0031b96d5d4ef9cfd5ced58543869f0 (diff)
downloadchromium_src-8fe04e160b1c67ed432f9d2aa5e9a987055a4b22.zip
chromium_src-8fe04e160b1c67ed432f9d2aa5e9a987055a4b22.tar.gz
chromium_src-8fe04e160b1c67ed432f9d2aa5e9a987055a4b22.tar.bz2
Update WebKit to r48317.
TBR=brettw BUG=none TEST=none Review URL: http://codereview.chromium.org/203044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 7a9e429..ad224dc 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2322,3 +2322,14 @@ BUG21501 LINUX DEBUG : LayoutTests/svg/custom/linking-a-03-b-preserveAspectRatio
// Need investigation after we enable file URL universal access in test shell.
BUG_JIANLI WIN : LayoutTests/fast/events/dispatchEvent-crash.html = CRASH
BUG_JIANLI : LayoutTests/editing/selection/drag-in-iframe.html = FAIL
+
+// New tests added in r48284
+BUG21644 : LayoutTests/http/tests/security/mixedContent/about-blank-iframe-in-main-frame.html = FAIL
+BUG21644 : LayoutTests/http/tests/security/mixedContent/data-url-iframe-in-main-frame.html = FAIL
+BUG21644 : LayoutTests/http/tests/security/mixedContent/insecure-css-in-main-frame.html = FAIL
+BUG21644 : LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame.html = FAIL
+BUG21644 : LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame.html = FAIL
+BUG21644 : LayoutTests/http/tests/security/mixedContent/insecure-script-in-iframe.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-http-to-https-script-in-iframe.html = FAIL
+BUG21644 : LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html = FAIL