1 files changed, 11 insertions, 10 deletions

diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index 505b727b3b8..37564d22e54 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -6,11 +6,12 @@ use dom::attr::{Attr, AttrHelpersForLayout, AttrValue};
 use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding;
 use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding::HTMLIFrameElementMethods;
 use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
-use dom::bindings::conversions::{Castable, ToJSValConvertible};
+use dom::bindings::conversions::{ToJSValConvertible};
 use dom::bindings::error::{Error, ErrorResult, Fallible};
 use dom::bindings::global::GlobalRef;
+use dom::bindings::inheritance::Castable;
 use dom::bindings::js::{Root, LayoutJS};
-use dom::bindings::utils::Reflectable;
+use dom::bindings::reflector::Reflectable;
 use dom::customevent::CustomEvent;
 use dom::document::Document;
 use dom::element::{self, AttributeMutation, Element};
@@ -68,12 +69,12 @@ impl HTMLIFrameElement {
     pub fn get_url(&self) -> Option<Url> {
         let element = self.upcast::<Element>();
         element.get_attribute(&ns!(""), &atom!("src")).and_then(|src| {
-            let url = src.r().value();
+            let url = src.value();
             if url.is_empty() {
                 None
             } else {
                 let window = window_from_node(self);
-                UrlParser::new().base_url(&window.r().get_url())
+                UrlParser::new().base_url(&window.get_url())
                     .parse(&url).ok()
             }
         })
@@ -84,7 +85,7 @@ impl HTMLIFrameElement {
 
         let old_subpage_id = self.subpage_id.get();
         let win = window_from_node(self);
-        let subpage_id = win.r().get_next_subpage_id();
+        let subpage_id = win.get_next_subpage_id();
         self.subpage_id.set(Some(subpage_id));
         (subpage_id, old_subpage_id)
     }
@@ -137,13 +138,13 @@ impl HTMLIFrameElement {
 
         if self.Mozbrowser() {
             let window = window_from_node(self);
-            let cx = window.r().get_cx();
+            let cx = window.get_cx();
             let _ar = JSAutoRequest::new(cx);
             let _ac = JSAutoCompartment::new(cx, window.reflector().get_jsobject().get());
             let mut detail = RootedValue::new(cx, UndefinedValue());
             event.detail().to_jsval(cx, detail.handle_mut());
             let custom_event = CustomEvent::new(GlobalRef::Window(window.r()),
-                                                event.name().to_owned(),
+                                                DOMString(event.name().to_owned()),
                                                 true,
                                                 true,
                                                 detail.handle());
@@ -271,7 +272,7 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement {
             let children = window.page().children.borrow();
             children.iter().find(|page| {
                 let window = page.window();
-                window.r().subpage() == Some(subpage_id)
+                window.subpage() == Some(subpage_id)
             }).map(|page| page.window())
         })
     }
@@ -283,10 +284,10 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement {
                 Some(self_url) => self_url,
                 None => return None,
             };
-            let win_url = window_from_node(self).r().get_url();
+            let win_url = window_from_node(self).get_url();
 
             if UrlHelper::SameOrigin(&self_url, &win_url) {
-                Some(window.r().Document())
+                Some(window.Document())
             } else {
                 None
             }