1 files changed, 46 insertions, 9 deletions
diff --git a/src/components/script/dom/htmliframeelement.rs b/src/components/script/dom/htmliframeelement.rs
index 1c44fa33e4d..f92fddabdaa 100644
--- a/src/components/script/dom/htmliframeelement.rs
+++ b/src/components/script/dom/htmliframeelement.rs
@@ -5,19 +5,22 @@
 use dom::bindings::codegen::BindingDeclarations::HTMLIFrameElementBinding;
 use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLIFrameElementDerived, HTMLElementCast};
 use dom::bindings::error::ErrorResult;
-use dom::bindings::js::{JSRef, Temporary};
-use dom::bindings::trace::Untraceable;
+use dom::bindings::js::{JSRef, Temporary, OptionalRootable};
 use dom::document::Document;
 use dom::element::{HTMLIFrameElementTypeId, Element};
 use dom::element::AttributeHandlers;
 use dom::eventtarget::{EventTarget, NodeTargetTypeId};
 use dom::htmlelement::HTMLElement;
-use dom::node::{Node, ElementNodeTypeId};
+use dom::node::{Node, ElementNodeTypeId, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 use dom::window::Window;
+use servo_msg::constellation_msg::{PipelineId, SubpageId};
+use servo_msg::constellation_msg::{IFrameSandboxed, IFrameUnsandboxed};
+use servo_msg::constellation_msg::{ConstellationChan, LoadIframeUrlMsg};
+use servo_util::namespace::Null;
 use servo_util::str::DOMString;
+use servo_util::url::try_parse_url;
 
-use servo_msg::constellation_msg::{PipelineId, SubpageId};
 use std::ascii::StrAsciiExt;
 use url::Url;
 
@@ -34,7 +37,6 @@ enum SandboxAllowance {
 #[deriving(Encodable)]
 pub struct HTMLIFrameElement {
     pub htmlelement: HTMLElement,
-    frame: Untraceable<Option<Url>>,
     pub size: Option<IFrameSize>,
     pub sandbox: Option<u8>
 }
@@ -53,7 +55,7 @@ pub struct IFrameSize {
 
 pub trait HTMLIFrameElementHelpers {
     fn is_sandboxed(&self) -> bool;
-    fn set_frame(&mut self, frame: Url);
+    fn get_url(&self) -> Option<Url>;
 }
 
 impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> {
@@ -61,8 +63,13 @@ impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> {
         self.sandbox.is_some()
     }
 
-    fn set_frame(&mut self, frame: Url) {
-        *self.frame = Some(frame);
+    fn get_url(&self) -> Option<Url> {
+        let element: &JSRef<Element> = ElementCast::from_ref(self);
+        element.get_attribute(Null, "src").root().and_then(|src| {
+            let window = window_from_node(self).root();
+            try_parse_url(src.deref().value_ref(),
+                          Some(window.deref().page().get_url())).ok()
+        })
     }
 }
 
@@ -70,7 +77,6 @@ impl HTMLIFrameElement {
     pub fn new_inherited(localName: DOMString, document: &JSRef<Document>) -> HTMLIFrameElement {
         HTMLIFrameElement {
             htmlelement: HTMLElement::new_inherited(HTMLIFrameElementTypeId, localName, document),
-            frame: Untraceable::new(None),
             size: None,
             sandbox: None,
         }
@@ -275,4 +281,35 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLIFrameElement> {
             self.deref_mut().sandbox = None;
         }
     }
+
+    fn bind_to_tree(&mut self) {
+        match self.super_type() {
+            Some(ref mut s) => s.bind_to_tree(),
+            _ => (),
+        }
+
+        match self.get_url() {
+            Some(url) => {
+                let sandboxed = if self.is_sandboxed() {
+                    IFrameSandboxed
+                } else {
+                    IFrameUnsandboxed
+                };
+
+                // Subpage Id
+                let window = window_from_node(self).root();
+                let page = window.deref().page();
+                let subpage_id = page.get_next_subpage_id();
+
+                self.deref_mut().size = Some(IFrameSize {
+                    pipeline_id: page.id,
+                    subpage_id: subpage_id,
+                });
+
+                let ConstellationChan(ref chan) = *page.constellation_chan.deref();
+                chan.send(LoadIframeUrlMsg(url, page.id, subpage_id, sandboxed));
+            }
+            _ => ()
+        }
+    }
 }