Documentation and cleanup.

5 files changed, 8 insertions, 12 deletions

diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index 706c228c0b2..56c9b58288d 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -45,8 +45,6 @@ use js::JSFUN_CONSTRUCTOR;
 use js;
 
 /// Proxy handler for a WindowProxy.
-#[allow(raw_pointer_derive)]
-#[derive(Copy)]
 pub struct WindowProxyHandler(pub *const libc::c_void);
 
 #[allow(raw_pointer_derive)]
diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs
index e1be98f99af..b41adcb8b06 100644
--- a/components/script/dom/cssstyledeclaration.rs
+++ b/components/script/dom/cssstyledeclaration.rs
@@ -221,9 +221,8 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> {
 
         let owner = self.owner.root();
         let window = window_from_node(owner.r()).root();
-        let window = window.r();
         let decl_block = parse_style_attribute(synthesized_declaration.as_slice(),
-                                               &window.get_url());
+                                               &window.r().get_url());
 
         // Step 7
         if decl_block.normal.len() == 0 {
@@ -269,9 +268,8 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> {
 
         let owner = self.owner.root();
         let window = window_from_node(owner.r()).root();
-        let window = window.r();
         let decl_block = parse_style_attribute(property.as_slice(),
-                                               &window.get_url());
+                                               &window.r().get_url());
         let element: JSRef<Element> = ElementCast::from_ref(owner.r());
 
         // Step 5
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 1d611a6a643..6d559483e1e 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -386,7 +386,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> {
             Some(root) => root,
             None => return None,
         };
-        let root: JSRef<Node> = NodeCast::from_ref(root);
+        let root = NodeCast::from_ref(root);
         let win = self.window.root();
         let address = match win.r().layout().hit_test(root.to_trusted_node_address(), *point) {
             Ok(HitTestResponse(node_address)) => {
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index 3afcb2f4af2..35cc68c3da5 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -172,8 +172,8 @@ impl<'a> HTMLIFrameElementMethods for JSRef<'a, HTMLIFrameElement> {
             let window = window_from_node(self).root();
             let window = window.r();
             let children = window.page().children.borrow();
-            children.iter().find(|child| {
-                let window = child.window().root();
+            children.iter().find(|page| {
+                let window = page.window().root();
                 window.r().subpage() == Some(subpage_id)
             }).map(|page| page.window())
         })
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 30b1e6baaa0..28d7ac8b92d 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -56,7 +56,7 @@ use rustc_serialize::base64::{FromBase64, ToBase64, STANDARD};
 use std::cell::{Cell, Ref, RefMut};
 use std::default::Default;
 use std::ffi::CString;
-use std::mem::replace;
+use std::mem;
 use std::num::Float;
 use std::rc::Rc;
 use std::sync::mpsc::{channel, Receiver};
@@ -543,7 +543,7 @@ impl<'a> WindowHelpers for JSRef<'a, Window> {
     /// layout task has finished any pending request messages.
     fn join_layout(self) {
         let mut layout_join_port = self.layout_join_port.borrow_mut();
-        if let Some(join_port) = replace(&mut *layout_join_port, None) {
+        if let Some(join_port) = mem::replace(&mut *layout_join_port, None) {
             match join_port.try_recv() {
                 Err(Empty) => {
                     info!("script: waiting on layout");
@@ -652,7 +652,7 @@ impl<'a> WindowHelpers for JSRef<'a, Window> {
     }
 
     fn windowproxy_handler(self) -> WindowProxyHandler {
-        self.dom_static.windowproxy_handler
+        WindowProxyHandler(self.dom_static.windowproxy_handler.0)
     }
 
     fn get_next_subpage_id(self) -> SubpageId {