Implement safe rooting strategy via Unrooted, Root, JSRef, and JS.

1 files changed, 15 insertions, 15 deletions

diff --git a/src/components/script/dom/virtualmethods.rs b/src/components/script/dom/virtualmethods.rs
index 85ae37cb032..bf4681fab3b 100644
--- a/src/components/script/dom/virtualmethods.rs
+++ b/src/components/script/dom/virtualmethods.rs
@@ -8,7 +8,7 @@ use dom::bindings::codegen::InheritTypes::HTMLIFrameElementCast;
 use dom::bindings::codegen::InheritTypes::HTMLImageElementCast;
 use dom::bindings::codegen::InheritTypes::HTMLObjectElementCast;
 use dom::bindings::codegen::InheritTypes::HTMLStyleElementCast;
-use dom::bindings::js::JS;
+use dom::bindings::js::JSRef;
 use dom::element::Element;
 use dom::element::{ElementTypeId, HTMLImageElementTypeId};
 use dom::element::{HTMLIFrameElementTypeId, HTMLObjectElementTypeId, HTMLStyleElementTypeId};
@@ -62,7 +62,7 @@ pub trait VirtualMethods {
     }
 
     /// Called on the parent when a node is added to its child list.
-    fn child_inserted(&mut self, child: &JS<Node>) {
+    fn child_inserted(&mut self, child: &JSRef<Node>) {
         match self.super_type() {
             Some(ref mut s) => s.child_inserted(child),
             _ => (),
@@ -74,31 +74,31 @@ pub trait VirtualMethods {
 /// method call on the trait object will invoke the corresponding method on the
 /// concrete type, propagating up the parent hierarchy unless otherwise
 /// interrupted.
-pub fn vtable_for<'a>(node: &JS<Node>) -> ~VirtualMethods: {
+pub fn vtable_for<'a>(node: &JSRef<Node>) -> ~VirtualMethods: {
     match node.get().type_id {
         ElementNodeTypeId(HTMLImageElementTypeId) => {
-            let element: JS<HTMLImageElement> = HTMLImageElementCast::to(node).unwrap();
-            ~element as ~VirtualMethods:
+            let element: &JSRef<HTMLImageElement> = HTMLImageElementCast::to_ref(node).unwrap();
+            ~element.clone() as ~VirtualMethods:
         }
         ElementNodeTypeId(HTMLIFrameElementTypeId) => {
-            let element: JS<HTMLIFrameElement> = HTMLIFrameElementCast::to(node).unwrap();
-            ~element as ~VirtualMethods:
+            let element: &JSRef<HTMLIFrameElement> = HTMLIFrameElementCast::to_ref(node).unwrap();
+            ~element.clone() as ~VirtualMethods:
         }
         ElementNodeTypeId(HTMLObjectElementTypeId) => {
-            let element: JS<HTMLObjectElement> = HTMLObjectElementCast::to(node).unwrap();
-            ~element as ~VirtualMethods:
+            let element: &JSRef<HTMLObjectElement> = HTMLObjectElementCast::to_ref(node).unwrap();
+            ~element.clone() as ~VirtualMethods:
         }
         ElementNodeTypeId(HTMLStyleElementTypeId) => {
-            let element: JS<HTMLStyleElement> = HTMLStyleElementCast::to(node).unwrap();
-            ~element as ~VirtualMethods:
+            let element: &JSRef<HTMLStyleElement> = HTMLStyleElementCast::to_ref(node).unwrap();
+            ~element.clone() as ~VirtualMethods:
         }
         ElementNodeTypeId(ElementTypeId) => {
-            let element: JS<Element> = ElementCast::to(node).unwrap();
-            ~element as ~VirtualMethods:
+            let element: &JSRef<Element> = ElementCast::to_ref(node).unwrap();
+            ~element.clone() as ~VirtualMethods:
         }
         ElementNodeTypeId(_) => {
-            let element: JS<HTMLElement> = HTMLElementCast::to(node).unwrap();
-            ~element as ~VirtualMethods:
+            let element: &JSRef<HTMLElement> = HTMLElementCast::to_ref(node).unwrap();
+            ~element.clone() as ~VirtualMethods:
         }
         _ => {
             ~node.clone() as ~VirtualMethods: