auto merge of #1018 : ttaubert/servo/nodelist, r=jdm

This should fix #652 and #775. I'm not sure if that's all that is needed to properly implement NodeList? Should we add tests somewhere? Sorry for any stupid stuff I might have done :)

r? @jdm

1 files changed, 3 insertions, 12 deletions

diff --git a/src/components/script/dom/htmlmapelement.rs b/src/components/script/dom/htmlmapelement.rs
index 4a924e96a0b..124cafc98fb 100644
--- a/src/components/script/dom/htmlmapelement.rs
+++ b/src/components/script/dom/htmlmapelement.rs
@@ -2,10 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use dom::bindings::utils::{DOMString, ErrorResult, Reflectable};
+use dom::bindings::utils::{DOMString, ErrorResult};
 use dom::htmlcollection::HTMLCollection;
 use dom::htmlelement::HTMLElement;
-use js::jsapi::{JSObject, JSContext};
 
 pub struct HTMLMapElement {
     htmlelement: HTMLElement
@@ -20,16 +19,8 @@ impl HTMLMapElement {
         Ok(())
     }
 
-    fn get_scope_and_cx(&self) -> (*JSObject, *JSContext) {
-        let doc = self.htmlelement.element.node.owner_doc;
-        let win = doc.with_base(|doc| doc.window.unwrap());
-        let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
-        let scope = win.reflector().get_jsobject();
-        (scope, cx)
-    }
-
     pub fn Areas(&self) -> @mut HTMLCollection {
-        let (scope, cx) = self.get_scope_and_cx();
-        HTMLCollection::new(~[], cx, scope)        
+        let (scope, cx) = self.htmlelement.element.node.get_scope_and_cx();
+        HTMLCollection::new(~[], cx, scope)
     }
 }