diff options
| author | Tomasz Kołodziejski <tkolodziejski@gmail.com> | 2014-11-10 14:42:59 -0800 |
|---|---|---|
| committer | Tomasz Kołodziejski <tkolodziejski@gmail.com> | 2014-11-13 22:45:46 -0800 |
| commit | af30484f2aba64bb79e6074297ef1d28d7e75ffc (patch) | |
| tree | 81cc285c96f60b600d6d1736d7fa03dd5fc3fef6 | |
| parent | 8cb2b922ef8541aee9207efbacf0c125b61f8aaf (diff) | |
| download | servo-af30484f2aba64bb79e6074297ef1d28d7e75ffc.tar.gz servo-af30484f2aba64bb79e6074297ef1d28d7e75ffc.zip | |
Add contentDocument support for HTMLIFrameElement. Fixes #3808.
| -rw-r--r-- | components/script/dom/htmliframeelement.rs | 18 | ||||
| -rw-r--r-- | components/script/dom/urlhelper.rs | 14 | ||||
| -rw-r--r-- | components/script/dom/webidls/HTMLIFrameElement.webidl | 2 | ||||
| -rw-r--r-- | tests/content/test_iframe_contentDocument.html | 27 | ||||
| -rw-r--r-- | tests/content/test_iframe_contentDocument_inner.html | 1 |
5 files changed, 61 insertions, 1 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index e9e1fae2e27..59c7011a9c7 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -6,6 +6,7 @@ use dom::attr::Attr; use dom::attr::AttrHelpers; use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding; use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding::HTMLIFrameElementMethods; +use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast}; use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLIFrameElementDerived}; use dom::bindings::js::{JSRef, Temporary, OptionalRootable}; @@ -16,6 +17,7 @@ use dom::element::AttributeHandlers; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; use dom::htmlelement::HTMLElement; use dom::node::{Node, NodeHelpers, ElementNodeTypeId, window_from_node}; +use dom::urlhelper::UrlHelper; use dom::virtualmethods::VirtualMethods; use dom::window::Window; use page::IterablePage; @@ -180,6 +182,22 @@ impl<'a> HTMLIFrameElementMethods for JSRef<'a, HTMLIFrameElement> { }) }) } + + fn GetContentDocument(self) -> Option<Temporary<Document>> { + self.GetContentWindow().root().and_then(|window| { + let self_url = match self.get_url() { + Some(self_url) => self_url, + None => return None, + }; + let win_url = window_from_node(self).root().page().get_url(); + + if UrlHelper::SameOrigin(&self_url, &win_url) { + Some(window.Document()) + } else { + None + } + }) + } } impl<'a> VirtualMethods for JSRef<'a, HTMLIFrameElement> { diff --git a/components/script/dom/urlhelper.rs b/components/script/dom/urlhelper.rs index f678e273876..251f8283e1e 100644 --- a/components/script/dom/urlhelper.rs +++ b/components/script/dom/urlhelper.rs @@ -27,4 +27,18 @@ impl UrlHelper { Some(ref hash) => format!("#{}", hash) } } + + /// https://html.spec.whatwg.org/multipage/browsers.html#same-origin + pub fn SameOrigin(urlA: &Url, urlB: &Url) -> bool { + if urlA.host() != urlB.host() { + return false + } + if urlA.scheme != urlB.scheme { + return false + } + if urlA.port() != urlB.port() { + return false + } + return true + } } diff --git a/components/script/dom/webidls/HTMLIFrameElement.webidl b/components/script/dom/webidls/HTMLIFrameElement.webidl index 201f8700ce4..7768065545c 100644 --- a/components/script/dom/webidls/HTMLIFrameElement.webidl +++ b/components/script/dom/webidls/HTMLIFrameElement.webidl @@ -14,7 +14,7 @@ interface HTMLIFrameElement : HTMLElement { // attribute boolean allowFullscreen; // attribute DOMString width; // attribute DOMString height; - //readonly attribute Document? contentDocument; + readonly attribute Document? contentDocument; //readonly attribute WindowProxy? contentWindow; readonly attribute Window? contentWindow; diff --git a/tests/content/test_iframe_contentDocument.html b/tests/content/test_iframe_contentDocument.html new file mode 100644 index 00000000000..c87a273eeb8 --- /dev/null +++ b/tests/content/test_iframe_contentDocument.html @@ -0,0 +1,27 @@ +<html> +<head> +<meta charset="utf8" /> +<script src="harness.js"></script> +<title>Iframe contentDocument test.</title> +</head> +<body> +<iframe src="test_iframe_contentDocument_inner.html" id="iframe"></iframe> +<script> +waitForExplicitFinish(); + +var timeout = 100; +var iframe = document.getElementById('iframe'); +function test_contentWindow() { + if (!iframe.contentWindow) { + // Iframe not loaded yet, try again. + // No load event for iframe, insert bug number here. + setTimeout(test_contentWindow, timeout); + return; + } + is(iframe.contentDocument.getElementById('test').textContent, 'value'); + finish(); +} +test_contentWindow(); +</script> +</body> +</html> diff --git a/tests/content/test_iframe_contentDocument_inner.html b/tests/content/test_iframe_contentDocument_inner.html new file mode 100644 index 00000000000..2fb85a9b2c2 --- /dev/null +++ b/tests/content/test_iframe_contentDocument_inner.html @@ -0,0 +1 @@ +<html><body><div id="test">value</div></body></html> |