Title: [183057] branches/safari-600.1.4.16-branch/LayoutTests
- Revision
- 183057
- Author
- bshaf...@apple.com
- Date
- 2015-04-21 00:27:29 -0700 (Tue, 21 Apr 2015)
Log Message
Merged r182299. rdar://problem/20623641
Modified Paths
Diff
Modified: branches/safari-600.1.4.16-branch/LayoutTests/ChangeLog (183056 => 183057)
--- branches/safari-600.1.4.16-branch/LayoutTests/ChangeLog 2015-04-21 07:25:50 UTC (rev 183056)
+++ branches/safari-600.1.4.16-branch/LayoutTests/ChangeLog 2015-04-21 07:27:29 UTC (rev 183057)
@@ -1,5 +1,20 @@
2015-04-21 Babak Shafiei <bshaf...@apple.com>
+ Merge r182299
+
+ 2015-04-02 Alexey Proskuryakov <a...@apple.com>
+
+ http/tests/security/cross-frame-access-call.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=143344
+
+ Reviewed by Anders Carlsson.
+
+ * TestExpectations:
+ * http/tests/security/cross-frame-access-call-expected.txt:
+ Correct the results. Not sure where I got the different results from.
+
+2015-04-21 Babak Shafiei <bshaf...@apple.com>
+
Merge r182284
2015-04-02 Alexey Proskuryakov <a...@apple.com>
Modified: branches/safari-600.1.4.16-branch/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt (183056 => 183057)
--- branches/safari-600.1.4.16-branch/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt 2015-04-21 07:25:50 UTC (rev 183056)
+++ branches/safari-600.1.4.16-branch/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt 2015-04-21 07:27:29 UTC (rev 183057)
@@ -26,6 +26,8 @@
CONSOLE MESSAGE: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
CONSOLE MESSAGE: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
CONSOLE MESSAGE: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 1: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 1: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
----- tests for calling methods of another frame using Function.call -----
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
