Title: [107300] branches/chromium/1025
- Revision
- 107300
- Author
- [email protected]
- Date
- 2012-02-09 15:59:58 -0800 (Thu, 09 Feb 2012)
Log Message
Merge 107046
BUG=113160
Review URL: https://chromiumcodereview.appspot.com/9370040
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1025/LayoutTests/http/tests/security/cross-frame-access-frameelement-expected.txt (from rev 107046, trunk/LayoutTests/http/tests/security/cross-frame-access-frameelement-expected.txt) (0 => 107300)
--- branches/chromium/1025/LayoutTests/http/tests/security/cross-frame-access-frameelement-expected.txt (rev 0)
+++ branches/chromium/1025/LayoutTests/http/tests/security/cross-frame-access-frameelement-expected.txt 2012-02-09 23:59:58 UTC (rev 107300)
@@ -0,0 +1,15 @@
+CONSOLE MESSAGE: Unsafe _javascript_ attempt to access frame with URL http://127.0.0.1:8000/security/cross-frame-access-frameelement.html from frame with URL http://127.0.0.1:8080/security/resources/cross-frame-access-frameelement-from-iframe.html. Domains, protocols and ports must match.
+
+This test checks if frameElement is accessible from the same or cross origin iframe.
+
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+[object HTMLIFrameElement]
+
+--------
+Frame: '<!--framePath //<!--frame1-->-->'
+--------
+undefined
Copied: branches/chromium/1025/LayoutTests/http/tests/security/cross-frame-access-frameelement.html (from rev 107046, trunk/LayoutTests/http/tests/security/cross-frame-access-frameelement.html) (0 => 107300)
--- branches/chromium/1025/LayoutTests/http/tests/security/cross-frame-access-frameelement.html (rev 0)
+++ branches/chromium/1025/LayoutTests/http/tests/security/cross-frame-access-frameelement.html 2012-02-09 23:59:58 UTC (rev 107300)
@@ -0,0 +1,15 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.dumpChildFramesAsText();
+}
+</script>
+</head>
+<body>
+<p>This test checks if frameElement is accessible from the same or cross origin iframe.</p>
+<iframe src=""
+<iframe src=""
+</body>
+</html>
Copied: branches/chromium/1025/LayoutTests/http/tests/security/resources/cross-frame-access-frameelement-from-iframe.html (from rev 107046, trunk/LayoutTests/http/tests/security/resources/cross-frame-access-frameelement-from-iframe.html) (0 => 107300)
--- branches/chromium/1025/LayoutTests/http/tests/security/resources/cross-frame-access-frameelement-from-iframe.html (rev 0)
+++ branches/chromium/1025/LayoutTests/http/tests/security/resources/cross-frame-access-frameelement-from-iframe.html 2012-02-09 23:59:58 UTC (rev 107300)
@@ -0,0 +1,7 @@
+<body>
+<div id="console"></div>
+<script src=""
+<script>
+log(eval("window.frameElement"));
+</script>
+</body>
Modified: branches/chromium/1025/Source/WebCore/page/DOMWindow.idl (107299 => 107300)
--- branches/chromium/1025/Source/WebCore/page/DOMWindow.idl 2012-02-09 23:41:30 UTC (rev 107299)
+++ branches/chromium/1025/Source/WebCore/page/DOMWindow.idl 2012-02-09 23:59:58 UTC (rev 107300)
@@ -61,7 +61,7 @@
DOMSelection getSelection();
- readonly attribute [CheckNodeSecurity] Element frameElement;
+ readonly attribute [CheckAccessToNode] Element frameElement;
[DoNotCheckDomainSecurity] void focus();
[DoNotCheckDomainSecurity] void blur();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
