Title: [103454] branches/safari-534.54-branch
Diff
Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (103453 => 103454)
--- branches/safari-534.54-branch/LayoutTests/ChangeLog 2011-12-21 22:35:02 UTC (rev 103453)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog 2011-12-21 22:38:33 UTC (rev 103454)
@@ -1,5 +1,20 @@
2011-12-21 Lucas Forschler <[email protected]>
+ Merge 95028
+
+ 2011-09-12 Sam Weinig <[email protected]>
+
+ Object.getPrototypeOf should use JSValue::get()
+ https://bugs.webkit.org/show_bug.cgi?id=67973
+
+ Reviewed by Darin Adler.
+
+ * http/tests/security/cross-frame-access-object-getPrototypeOf-expected.txt: Added.
+ * http/tests/security/cross-frame-access-object-getPrototypeOf.html: Added.
+ * http/tests/security/resources/cross-frame-iframe-for-object-getPrototypeOf-test.html: Added.
+
+2011-12-21 Lucas Forschler <[email protected]>
+
Merge 94991
2011-09-12 Dan Bernstein <[email protected]>
Copied: branches/safari-534.54-branch/LayoutTests/http/tests/security/cross-frame-access-object-getPrototypeOf-expected.txt (from rev 95028, trunk/LayoutTests/http/tests/security/cross-frame-access-object-getPrototypeOf-expected.txt) (0 => 103454)
--- branches/safari-534.54-branch/LayoutTests/http/tests/security/cross-frame-access-object-getPrototypeOf-expected.txt (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/http/tests/security/cross-frame-access-object-getPrototypeOf-expected.txt 2011-12-21 22:38:33 UTC (rev 103454)
@@ -0,0 +1,9 @@
+CONSOLE MESSAGE: line 1: Unsafe _javascript_ attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-object-getPrototypeOf-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-object-getPrototypeOf.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-object-getPrototypeOf-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-object-getPrototypeOf.html. Domains, protocols and ports must match.
+
+This tests that you can't get the prototype of the window or history objects cross-origin using Object.getPrototypeOf().
+
+PASS: Object.getPrototypeOf(targetWindow) should be 'undefined' and is.
+PASS: Object.getPrototypeOf(targetWindow.history) should be 'undefined' and is.
+
Copied: branches/safari-534.54-branch/LayoutTests/http/tests/security/cross-frame-access-object-getPrototypeOf.html (from rev 95028, trunk/LayoutTests/http/tests/security/cross-frame-access-object-getPrototypeOf.html) (0 => 103454)
--- branches/safari-534.54-branch/LayoutTests/http/tests/security/cross-frame-access-object-getPrototypeOf.html (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/http/tests/security/cross-frame-access-object-getPrototypeOf.html 2011-12-21 22:38:33 UTC (rev 103454)
@@ -0,0 +1,34 @@
+<html>
+<head>
+ <script src=""
+ <script>
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ }
+
+ // Set up listener for message from iframe
+ addEventListener('message', function(event) {
+ if (event.data == "finishedLoad")
+ doTest();
+ }, false);
+
+
+ doTest = function()
+ {
+ targetWindow = document.getElementById("target").contentWindow;
+
+ shouldBeUndefined("Object.getPrototypeOf(targetWindow)");
+ shouldBeUndefined("Object.getPrototypeOf(targetWindow.history)");
+
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }
+ </script>
+</head>
+<body>
+ <div>This tests that you can't get the prototype of the window or history objects cross-origin using Object.getPrototypeOf().</div>
+ <iframe id="target" src=""
+ <pre id="console"></pre>
+</body>
+</html>
Copied: branches/safari-534.54-branch/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-object-getPrototypeOf-test.html (from rev 95028, trunk/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-object-getPrototypeOf-test.html) (0 => 103454)
--- branches/safari-534.54-branch/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-object-getPrototypeOf-test.html (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-object-getPrototypeOf-test.html 2011-12-21 22:38:33 UTC (rev 103454)
@@ -0,0 +1,13 @@
+<html>
+<head>
+ <script>
+ _onload_ = function()
+ {
+ parent.postMessage("finishedLoad", "*");
+ }
+ </script>
+</head>
+<body>
+ Body
+</body>
+</html>
Modified: branches/safari-534.54-branch/Source/_javascript_Core/ChangeLog (103453 => 103454)
--- branches/safari-534.54-branch/Source/_javascript_Core/ChangeLog 2011-12-21 22:35:02 UTC (rev 103453)
+++ branches/safari-534.54-branch/Source/_javascript_Core/ChangeLog 2011-12-21 22:38:33 UTC (rev 103454)
@@ -1,5 +1,20 @@
2011-12-21 Lucas Forschler <[email protected]>
+ Merge 95028
+
+ 2011-09-13 Sam Weinig <[email protected]>
+
+ Object.getPrototypeOf should use JSValue::get()
+ https://bugs.webkit.org/show_bug.cgi?id=67973
+
+ Reviewed by Darin Adler.
+
+ * runtime/ObjectConstructor.cpp:
+ (JSC::objectConstructorGetPrototypeOf):
+ Pipe through JSValue::get() to allow overrides.
+
+2011-12-21 Lucas Forschler <[email protected]>
+
Merge 94095
2011-08-30 Oliver Hunt <[email protected]>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
