diff options
Diffstat (limited to 'webkit')
3 files changed, 2 insertions, 7 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-expected.txt index 952269e..b47269b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-expected.txt @@ -1,4 +1,4 @@ -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<html><body><p id='accessMe'></p><p>Inner iframe.</p></body></html> from frame with URL http://127.0.0.1:8000/security/dataURL/xss-DENIED-to-data-url-sub-frame.html. Domains, protocols and ports must match. +CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<html><script>onload = function() { parent.postMessage('LOADED', '*'); } </script><body><p id='accessMe'></p><p>Inner iframe.</p></body></html> from frame with URL http://127.0.0.1:8000/security/dataURL/xss-DENIED-to-data-url-sub-frame.html. Domains, protocols and ports must match. This tests that the main frame can't access the contents of an iframe that contains a data: URL loaded page diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-uppercase-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-uppercase-expected.txt index 4caa558..9253013 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-uppercase-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-uppercase-expected.txt @@ -1,4 +1,4 @@ -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<html><body><p id='accessMe'></p><p>Inner iframe.</p></body></html> from frame with URL http://127.0.0.1:8000/security/dataURL/xss-DENIED-to-data-url-sub-frame-uppercase.html. Domains, protocols and ports must match. +CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<html><script>onload = function() { parent.postMessage('LOADED', '*'); } </script><body><p id='accessMe'></p><p>Inner iframe.</p></body></html> from frame with URL http://127.0.0.1:8000/security/dataURL/xss-DENIED-to-data-url-sub-frame-uppercase.html. Domains, protocols and ports must match. This tests that the main frame can't access the contents of an iframe that contains a data: URL loaded page using the uppercased variant DATA: diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index c9a3d91..a848712 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -533,11 +533,6 @@ LayoutTests/fast/js/date-set-to-nan.html = FAIL // http://crbug.com/2844 SKIP : LayoutTests/http/tests/appcache = TIMEOUT FAIL -// Depends on postMessage in a way we don't support: -// http://code.google.com/p/chromium/issues/detail?id=2857 -LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-uppercase.html = FAIL -LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame.html = FAIL - // V8 failures as a result of the WebKit merge. // http://code.google.com/p/v8/issues/detail?id=92 LayoutTests/fast/js/constructor-attributes.html = FAIL |