Title: [148334] branches/safari-536.30-branch/LayoutTests
- Revision
- 148334
- Author
- lforsch...@apple.com
- Date
- 2013-04-12 18:52:13 -0700 (Fri, 12 Apr 2013)
Log Message
Merged r128747. <rdar://problem/13266379>
Modified Paths
Diff
Modified: branches/safari-536.30-branch/LayoutTests/ChangeLog (148333 => 148334)
--- branches/safari-536.30-branch/LayoutTests/ChangeLog 2013-04-13 01:47:54 UTC (rev 148333)
+++ branches/safari-536.30-branch/LayoutTests/ChangeLog 2013-04-13 01:52:13 UTC (rev 148334)
@@ -1,5 +1,31 @@
2013-04-12 Lucas Forschler <lforsch...@apple.com>
+ Merge r128747
+
+ 2012-09-17 Christophe Dumez <christophe.du...@intel.com>
+
+ [JSC] http/tests/security/cross-frame-access-put.html failing after r123145
+ https://bugs.webkit.org/show_bug.cgi?id=91843
+
+ Reviewed by Adam Barth.
+
+ Since r123145, window.top is not longer replaceable in JSC, to bring it
+ in line with other browsers. The http/tests/security/cross-frame-access-put.html
+ now needs to be updated because it is still testing the window.top setter.
+
+ Thanks to this fix, we can now get rid of the platform-specific results for
+ ports using JSC.
+
+ * http/tests/security/cross-frame-access-put-expected.txt:
+ * http/tests/security/cross-frame-access-put.html:
+ * platform/chromium/http/tests/security/cross-frame-access-put-expected.txt:
+ * platform/efl/TestExpectations: Unskip test case.
+ * platform/gtk/http/tests/security/cross-frame-access-put-expected.txt: Removed.
+ * platform/mac/Skipped: Unskip test case.
+ * platform/qt/http/tests/security/cross-frame-access-put-expected.txt: Removed.
+
+2013-04-12 Lucas Forschler <lforsch...@apple.com>
+
Merge r123167
2012-07-19 Erik Arvidsson <a...@chromium.org>
Modified: branches/safari-536.30-branch/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt (148333 => 148334)
--- branches/safari-536.30-branch/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt 2013-04-13 01:47:54 UTC (rev 148333)
+++ branches/safari-536.30-branch/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt 2013-04-13 01:52:13 UTC (rev 148334)
@@ -372,8 +372,6 @@
CONSOLE MESSAGE: Unsafe _javascript_ attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-put.html. Domains, protocols and ports must match.
-CONSOLE MESSAGE: Unsafe _javascript_ attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-put.html. Domains, protocols and ports must match.
-
ALERT: PASS: window.Attr should be '[object AttrConstructor]' and is.
ALERT: PASS: window.CDATASection should be '[object CDATASectionConstructor]' and is.
ALERT: PASS: window.CharacterData should be '[object CharacterDataConstructor]' and is.
Modified: branches/safari-536.30-branch/LayoutTests/http/tests/security/cross-frame-access-put.html (148333 => 148334)
--- branches/safari-536.30-branch/LayoutTests/http/tests/security/cross-frame-access-put.html 2013-04-13 01:47:54 UTC (rev 148333)
+++ branches/safari-536.30-branch/LayoutTests/http/tests/security/cross-frame-access-put.html 2013-04-13 01:52:13 UTC (rev 148334)
@@ -194,7 +194,6 @@
setForbiddenProperty(targetWindow, "toolbar");
setForbiddenProperty(targetWindow, "window");
setForbiddenProperty(targetWindow, "parent");
- setForbiddenProperty(targetWindow, "top");
// Functions
setForbiddenProperty(targetWindow, "addEventListener");
Modified: branches/safari-536.30-branch/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-put-expected.txt (148333 => 148334)
--- branches/safari-536.30-branch/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-put-expected.txt 2013-04-13 01:47:54 UTC (rev 148333)
+++ branches/safari-536.30-branch/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-put-expected.txt 2013-04-13 01:52:13 UTC (rev 148334)
@@ -382,8 +382,6 @@
CONSOLE MESSAGE: Unsafe _javascript_ attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-put.html. Domains, protocols and ports must match.
-CONSOLE MESSAGE: Unsafe _javascript_ attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-put.html. Domains, protocols and ports must match.
-
ALERT: PASS: window.Attr should be 'function Attr() { [native code] }' and is.
ALERT: PASS: window.CDATASection should be 'function CDATASection() { [native code] }' and is.
ALERT: PASS: window.CharacterData should be 'function CharacterData() { [native code] }' and is.
Modified: branches/safari-536.30-branch/LayoutTests/platform/mac/Skipped (148333 => 148334)
--- branches/safari-536.30-branch/LayoutTests/platform/mac/Skipped 2013-04-13 01:47:54 UTC (rev 148333)
+++ branches/safari-536.30-branch/LayoutTests/platform/mac/Skipped 2013-04-13 01:52:13 UTC (rev 148334)
@@ -724,9 +724,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=82750
http/tests/navigation/_javascript_link-frames.html
-# https://bugs.webkit.org/show_bug.cgi?id=82751
-http/tests/security/cross-frame-access-put.html
-
# https://bugs.webkit.org/show_bug.cgi?id=82752
plugins/netscape-dom-access-and-reload.html
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes