Reviewed by Dan Bernstein.
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Dec 2007 00:01:41 +0000 (00:01 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Dec 2007 00:01:41 +0000 (00:01 +0000)
        Fix mistaken duplication in cross-frame-access-child-explicit-domain.html that was causing
        intermittent failures.

        * http/tests/security/cross-frame-access-child-explicit-domain-expected.txt:
        * http/tests/security/cross-frame-access-child-explicit-domain.html:
        * http/tests/security/cross-frame-access-custom-expected.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28940 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/http/tests/security/cross-frame-access-child-explicit-domain-expected.txt
LayoutTests/http/tests/security/cross-frame-access-child-explicit-domain.html
LayoutTests/http/tests/security/cross-frame-access-custom-expected.txt

index 724d1df605ed83e5a2b87e29994ea15f9b01bf59..c3bee1d67e9c1b0d33604a7c343ec58f00217e8a 100644 (file)
@@ -1,3 +1,14 @@
+2007-12-21  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Fix mistaken duplication in cross-frame-access-child-explicit-domain.html that was causing
+        intermittent failures.
+
+        * http/tests/security/cross-frame-access-child-explicit-domain-expected.txt:
+        * http/tests/security/cross-frame-access-child-explicit-domain.html:
+        * http/tests/security/cross-frame-access-custom-expected.txt:
+
 2007-12-21  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Oliver.
index e35bca1c94f02c92609f76c29b8a1ef815430a84..2a2bb9ec9eca78e4b1a275d09d126d57637602c4 100644 (file)
@@ -4,13 +4,7 @@ CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http
 PASS: Cross frame access to frame explicitly setting document.domain was denied.
 
 
-
 --------
 Frame: 'aFrame'
 --------
 Inner iframe with explicit document.domain set.
-
---------
-Frame: '<!--framePath //<!--frame1-->-->'
---------
-
index 31d74ec50db9070e142166c809fca8adebbc3594..281870528d4ac19535cc9e4c46760bb1ca0997e5 100644 (file)
 </body>
 </html>
 <html>
-<head>
-    <script src="resources/cross-frame-access.js"></script>
-</head>
-<body>
-<iframe id="aFrame"></iframe>
-<pre id="console"></pre>
-<script>
-    var url = "http://127.0.0.1:8000/security/resources/cross-frame-iframe-with-explicit-domain-set.html";
-    var iframeId ="aFrame";
-    var passMessage = "PASS: Cross frame access to frame explicitly setting document.domain was denied.";
-    var failMessage = "Fail: Cross frame access to frame explicitly setting document.domain was allowed.";
-    cannotAccessFrame(url, iframeId, passMessage, failMessage);
-</script>
-</body>
-</html>
index fceddb962b5040812ea2fe9e77ea7ea8448ed52f..74c5c9e951e12b37b778cc5879d9767a90eaa543 100644 (file)
@@ -1,5 +1,3 @@
-CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://127.0.0.1:8000/security/resources/cross-frame-iframe-with-explicit-domain-set.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-child-explicit-domain.html. Domains, protocols and ports must match.
-
 CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-custom.html. Domains, protocols and ports must match.
 
 CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-custom.html. Domains, protocols and ports must match.