Changeset 107300 in webkit

Timestamp:

Feb 9, 2012, 3:59:58 PM (15 years ago)

Author:

cevans@google.com

Message:

Merge 107046
BUG=113160
Review URL: ​https://chromiumcodereview.appspot.com/9370040

Location:

branches/chromium/1025

Files:

• LayoutTests/http/tests/security/cross-frame-access-frameelement-expected.txt (copied) (copied from trunk/LayoutTests/http/tests/security/cross-frame-access-frameelement-expected.txt )
• LayoutTests/http/tests/security/cross-frame-access-frameelement.html (copied) (copied from trunk/LayoutTests/http/tests/security/cross-frame-access-frameelement.html )
• LayoutTests/http/tests/security/resources/cross-frame-access-frameelement-from-iframe.html (copied) (copied from trunk/LayoutTests/http/tests/security/resources/cross-frame-access-frameelement-from-iframe.html )
• Source/WebCore/page/DOMWindow.idl (modified) (1 diff)

branches/chromium/1025/Source/WebCore/page/DOMWindow.idl

@@ -62 +62 @@
         DOMSelection getSelection();
 
-        readonly attribute [CheckNodeSecurity] Element frameElement;
+        readonly attribute [CheckAccessToNode] Element frameElement;
 
         [DoNotCheckDomainSecurity] void focus();