Simplify the iframe content getters.

jdm · jdm · commit 3f4925520b3e · 2015-11-19T04:19:14.000-05:00
diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs
@@ -148,6 +148,13 @@ impl<'a> DocumentRef<'a> {
         }
     }
 
+    pub fn is_local(&self) -> bool {
+        match *self {
+            DocumentRef::Local(_) => true,
+            DocumentRef::Remote(_) => false,
+        }
+    }
+
     pub fn window(&self) -> WindowRef<'a> {
         match *self {
             DocumentRef::Local(ref document) => WindowRef::Local(document.window()),
@@ -174,6 +181,13 @@ impl<'a> WindowRef<'a> {
             WindowRef::Remote(_) => panic!("unexpected remote window"),
         }
     }
+
+    pub fn is_local(&self) -> bool {
+        match *self {
+            WindowRef::Local(_) => true,
+            WindowRef::Remote(_) => false,
+        }
+    }
 }
 
 // This isn't a DOM struct, just a convenience struct
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
@@ -6,7 +6,6 @@ use dom::attr::{Attr, AttrValue};
 use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserElementIconChangeEventDetail;
 use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding;
 use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding::HTMLIFrameElementMethods;
-use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
 use dom::bindings::conversions::{ToJSValConvertible};
 use dom::bindings::error::{Error, ErrorResult, Fallible};
 use dom::bindings::global::GlobalRef;
@@ -21,7 +20,6 @@ use dom::element::{AttributeMutation, Element, RawLayoutElementHelpers};
 use dom::event::{Event, EventBubbles, EventCancelable};
 use dom::htmlelement::HTMLElement;
 use dom::node::{Node, window_from_node};
-use dom::urlhelper::UrlHelper;
 use dom::virtualmethods::VirtualMethods;
 use dom::window::Window;
 use ipc_channel::ipc;
@@ -32,7 +30,6 @@ use msg::constellation_msg::ScriptMsg as ConstellationMsg;
 use msg::constellation_msg::{ConstellationChan, IframeLoadInfo, MozBrowserEvent};
 use msg::constellation_msg::{IFrameLoadType, AsyncIFrameLoad};
 use msg::constellation_msg::{NavigationDirection, PipelineId, SubpageId};
-use page::IterablePage;
 use script_task::{ScriptTaskEventCategory, CommonScriptMsg, ScriptTask, Runnable};
 use script_traits::ConstellationControlMsg;
 use std::ascii::AsciiExt;
@@ -391,28 +388,22 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement {
 
     // https://html.spec.whatwg.org/multipage/#dom-iframe-contentwindow
     fn GetContentWindow(&self) -> Option<Root<Window>> {
-        self.subpage_id.get().and_then(|subpage_id| {
-            let window = window_from_node(self);
-            let window = window.r();
-            let children = window.page().children.borrow();
-            children.iter().find(|page| {
-                let window = page.window();
-                window.subpage() == Some(subpage_id)
-            }).map(|page| page.window())
+        self.nested_browsing_context.get().and_then(|context| {
+            let window = context.active_window();
+            if window.is_local() {
+                Some(Root::from_ref(window.as_local()))
+            } else {
+                None
+            }
         })
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-iframe-contentdocument
     fn GetContentDocument(&self) -> Option<Root<Document>> {
-        self.GetContentWindow().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).get_url();
-
-            if UrlHelper::SameOrigin(&self_url, &win_url) {
-                Some(window.Document())
+        self.nested_browsing_context.get().map(|context| {
+            let document = context.active_document();
+            if document.is_local() {
+                Some(Root::from_ref(document.as_local()))
             } else {
                 None
             }

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,13 @@ impl<'a> DocumentRef<'a> {`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`
	`151`	`+ pub fn is_local(&self) -> bool {`
	`152`	`+ match *self {`
	`153`	`+ DocumentRef::Local(_) => true,`
	`154`	`+ DocumentRef::Remote(_) => false,`
	`155`	`+ }`
	`156`	`+ }`
	`157`	`+`
`151`	`158`	`pub fn window(&self) -> WindowRef<'a> {`
`152`	`159`	`match *self {`
`153`	`160`	`DocumentRef::Local(ref document) => WindowRef::Local(document.window()),`
`@@ -174,6 +181,13 @@ impl<'a> WindowRef<'a> {`
`174`	`181`	`WindowRef::Remote(_) => panic!("unexpected remote window"),`
`175`	`182`	`}`
`176`	`183`	`}`
	`184`	`+`
	`185`	`+ pub fn is_local(&self) -> bool {`
	`186`	`+ match *self {`
	`187`	`+ WindowRef::Local(_) => true,`
	`188`	`+ WindowRef::Remote(_) => false,`
	`189`	`+ }`
	`190`	`+ }`
`177`	`191`	`}`
`178`	`192`
`179`	`193`	`// This isn't a DOM struct, just a convenience struct`