Reviewed by Adele.
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Dec 2007 00:35:59 +0000 (00:35 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Dec 2007 00:35:59 +0000 (00:35 +0000)
        Fix another mistaken duplication, this time in cross-frame-access-parent-explicit-domain.html,
        that was causing intermittent failures.

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

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

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

index c3bee1d67e9c1b0d33604a7c343ec58f00217e8a..08c332d9e48c695cd2d1dd4a0e7577d3092f0c85 100644 (file)
@@ -1,3 +1,14 @@
+2007-12-21  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Adele.
+
+        Fix another mistaken duplication, this time in cross-frame-access-parent-explicit-domain.html,
+        that was causing intermittent failures.
+
+        * http/tests/security/cross-frame-access-parent-explicit-domain-expected.txt:
+        * http/tests/security/cross-frame-access-parent-explicit-domain.html:
+        * http/tests/security/cross-frame-access-port-explicit-domain-expected.txt:
+
 2007-12-21  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Dan Bernstein.
index 4a51a7c7e7a88ea1f8a8971accb47911652b5359..2a065f1744d97c6f8bbfe479a20c7812672b8451 100644 (file)
@@ -4,7 +4,6 @@ CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http
 PASS: Cross frame access from frame explicitly setting document.domain was denied.
 
 
-
 --------
 Frame: 'aFrame'
 --------
@@ -16,8 +15,3 @@ Inner iframe.
 Frame: 'flag'
 --------
 
-
---------
-Frame: '<!--framePath //<!--frame1-->-->'
---------
-
index c349272bd2ea6a8d50426d6f5bf7b55b463aecce..eedb364f5166b4d807faf217212128120ab4e3a0 100644 (file)
 </script>
 </body>
 </html>
-<html>
-<head>
-    <script src="resources/cross-frame-access.js"></script>
-</head>
-<body>
-<iframe id="aFrame"></iframe>
-<pre id="console"></pre>
-<script>
-    // Explicitly set the domain.
-    document.domain = "127.0.0.1";
-
-    var url = "http://127.0.0.1:8000/security/resources/cross-frame-iframe.html";
-    var iframeId ="aFrame";
-    var passMessage = "PASS: Cross frame access from frame explicitly setting document.domain was denied.";
-    var failMessage = "Fail: Cross frame access from frame explicitly setting document.domain was allowed.";
-    cannotAccessFrame(url, iframeId, passMessage, failMessage);
-</script>
-</body>
-</html>
index 532719437fdba035e017be0bcc575fb73b8bc016..a0a43302c74d17d775dc8a5f0e3faa5e745983b4 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.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-parent-explicit-domain.html. Domains, protocols and ports must match.
-
 This test currently fails because we check the port and protocol even if document.domain is explicitly set (rdar://problem/5366437).