Removed JS::root #8251

components/script/dom/bindings/global.rs

@@ -230,8 +230,8 @@ impl GlobalField {
     /// Create a stack-bounded root for this reference.
     pub fn root(&self) -> GlobalRoot {
         match *self {
-            GlobalField::Window(ref window) => GlobalRoot::Window(window.root()),
-            GlobalField::Worker(ref worker) => GlobalRoot::Worker(worker.root()),
+            GlobalField::Window(ref window) => GlobalRoot::Window(Root::from_ref(window)),
+            GlobalField::Worker(ref worker) => GlobalRoot::Worker(Root::from_ref(worker)),
         }
     }
 }

components/script/dom/bindings/js.rs

@@ -73,10 +73,6 @@ impl<T> JS<T> {
 }
 
 impl<T: Reflectable> JS<T> {
-    /// Root this JS-owned value to prevent its collection as garbage.
-    pub fn root(&self) -> Root<T> {
-        Root::new(self.ptr)
-    }
     /// Create a JS<T> from a Root<T>
     /// XXX Not a great API. Should be a call on Root<T> instead
     #[allow(unrooted_must_root)]
@@ -291,7 +287,7 @@ impl<T: Reflectable> MutHeap<JS<T>> {
     pub fn get(&self) -> Root<T> {
         debug_assert!(task_state::get().is_script());
         unsafe {
-            ptr::read(self.val.get()).root()
+            Root::from_ref(&*ptr::read(self.val.get()))
         }
     }
 }
@@ -369,7 +365,7 @@ impl<T: Reflectable> MutNullableHeap<JS<T>> {
     pub fn get(&self) -> Option<Root<T>> {
         debug_assert!(task_state::get().is_script());
         unsafe {
-            ptr::read(self.ptr.get()).map(|o| o.root())
+            ptr::read(self.ptr.get()).map(|o| Root::from_ref(&*o))
         }
     }
 

components/script/dom/canvasrenderingcontext2d.rs

@@ -148,7 +148,7 @@ impl CanvasRenderingContext2D {
     }
 
     fn mark_as_dirty(&self) {
-        self.canvas.root().upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
+        self.canvas.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
     }
 
     fn update_transform(&self) {
@@ -290,7 +290,7 @@ impl CanvasRenderingContext2D {
         let smoothing_enabled = self.state.borrow().image_smoothing_enabled;
 
         // If the source and target canvas are the same
-        let msg = if self.canvas.root().r() == canvas {
+        let msg = if &*self.canvas == canvas {
             CanvasMsg::Canvas2d(Canvas2dMsg::DrawImageSelf(image_size, dest_rect, source_rect, smoothing_enabled))
         } else { // Source and target canvases are different
             let context = match canvas.get_or_init_2d_context() {
@@ -367,8 +367,7 @@ impl CanvasRenderingContext2D {
 
     #[inline]
     fn request_image_from_cache(&self, url: Url) -> ImageResponse {
-        let canvas = self.canvas.root();
-        let window = window_from_node(canvas.r());
+        let window = window_from_node(&*self.canvas);
         canvas_utils::request_image_from_cache(window.r(), url)
     }
 
@@ -422,7 +421,7 @@ impl LayoutCanvasRenderingContext2DHelpers for LayoutJS<CanvasRenderingContext2D
 impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-canvas
     fn Canvas(&self) -> Root<HTMLCanvasElement> {
-        self.canvas.root()
+        Root::from_ref(&*self.canvas)
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-save
@@ -764,7 +763,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
                 StringOrCanvasGradientOrCanvasPattern::eString(result)
             },
             CanvasFillOrStrokeStyle::Gradient(ref gradient) => {
-                StringOrCanvasGradientOrCanvasPattern::eCanvasGradient(gradient.root())
+                StringOrCanvasGradientOrCanvasPattern::eCanvasGradient(Root::from_ref(&*gradient))
             },
         }
     }
@@ -804,7 +803,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
                 StringOrCanvasGradientOrCanvasPattern::eString(result)
             },
             CanvasFillOrStrokeStyle::Gradient(ref gradient) => {
-                StringOrCanvasGradientOrCanvasPattern::eCanvasGradient(gradient.root())
+                StringOrCanvasGradientOrCanvasPattern::eCanvasGradient(Root::from_ref(&*gradient))
             },
         }
     }
@@ -881,7 +880,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
         let (sender, receiver) = ipc::channel::<Vec<u8>>().unwrap();
         let dest_rect = Rect::new(Point2D::new(sx.to_i32().unwrap(), sy.to_i32().unwrap()),
                                   Size2D::new(sw as i32, sh as i32));
-        let canvas_size = self.canvas.root().r().get_size();
+        let canvas_size = self.canvas.get_size();
         let canvas_size = Size2D::new(canvas_size.width as f64, canvas_size.height as f64);
         self.ipc_renderer
             .send(CanvasMsg::Canvas2d(Canvas2dMsg::GetImageData(dest_rect, canvas_size, sender)))

components/script/dom/document.rs

@@ -391,8 +391,7 @@ impl Document {
             None => false,
             Some(elements) => {
                 let position = elements.iter()
-                                       .map(|elem| elem.root())
-                                       .position(|element| element.r() == to_unregister)
+                                       .position(|element| &**element == to_unregister)
                                        .expect("This element should be in registered.");
                 elements.remove(position);
                 elements.is_empty()
@@ -428,7 +427,7 @@ impl Document {
                 let root = root.upcast::<Node>();
                 for node in root.traverse_preorder() {
                     if let Some(elem) = node.downcast() {
-                        if (*elements)[head].root().r() == elem {
+                        if &*(*elements)[head] == elem {
                             head += 1;
                         }
                         if new_node == node.r() || head == elements.len() {
@@ -685,8 +684,7 @@ impl Document {
         // under the mouse.
         for target in prev_mouse_over_targets.iter() {
             if !mouse_over_targets.contains(target) {
-                let target = target.root();
-                let target_ref = target.r();
+                let target_ref = &**target;
                 if target_ref.get_hover_state() {
                     target_ref.set_hover_state(false);
 
@@ -749,37 +747,37 @@ impl Document {
             },
         };
         let target = el.upcast::<EventTarget>();
-        let window = self.window.root();
+        let window = &*self.window;
 
         let client_x = Finite::wrap(point.x as f64);
         let client_y = Finite::wrap(point.y as f64);
         let page_x = Finite::wrap(point.x as f64 + window.PageXOffset() as f64);
         let page_y = Finite::wrap(point.y as f64 + window.PageYOffset() as f64);
 
-        let touch = Touch::new(window.r(), identifier, target,
+        let touch = Touch::new(window, identifier, target,
                                client_x, client_y, // TODO: Get real screen coordinates?
                                client_x, client_y,
                                page_x, page_y);
 
         let mut touches = RootedVec::new();
         touches.push(JS::from_rooted(&touch));
-        let touches = TouchList::new(window.r(), touches.r());
+        let touches = TouchList::new(window, touches.r());
 
-        let event = TouchEvent::new(window.r(),
+        let event = TouchEvent::new(window,
                                     event_name,
                                     EventBubbles::Bubbles,
                                     EventCancelable::Cancelable,
-                                    Some(window.r()),
+                                    Some(window),
                                     0i32,
                                     &touches, &touches, &touches,
                                     // FIXME: modifier keys
                                     false, false, false, false);
         let event = event.upcast::<Event>();
         let result = event.fire(target);
 
-        window.r().reflow(ReflowGoal::ForDisplay,
-                          ReflowQueryType::NoQuery,
-                          ReflowReason::MouseEvent);
+        window.reflow(ReflowGoal::ForDisplay,
+                      ReflowQueryType::NoQuery,
+                      ReflowReason::MouseEvent);
         result
     }
 
@@ -1089,13 +1087,15 @@ impl Document {
         }
         let mut deferred_scripts = self.deferred_scripts.borrow_mut();
         while !deferred_scripts.is_empty() {
-            let script = deferred_scripts[0].root();
-            // Part of substep 1.
-            if !script.is_ready_to_be_executed() {
-                return;
+            {
+                let script = &*deferred_scripts[0];
+                // Part of substep 1.
+                if !script.is_ready_to_be_executed() {
+                    return;
+                }
+                // Substep 2.
+                script.execute();
             }
-            // Substep 2.
-            script.execute();
             // Substep 3.
             deferred_scripts.remove(0);
             // Substep 4 (implicit).
@@ -1110,7 +1110,7 @@ impl Document {
         // Execute the first in-order asap-executed script if it's ready, repeat as required.
         // Re-borrowing the list for each step because it can also be borrowed under execute.
         while self.asap_in_order_scripts_list.borrow().len() > 0 {
-            let script = self.asap_in_order_scripts_list.borrow()[0].root();
+            let script = Root::from_ref(&*self.asap_in_order_scripts_list.borrow()[0]);
             if !script.r().is_ready_to_be_executed() {
                 break;
             }
@@ -1121,7 +1121,7 @@ impl Document {
         let mut idx = 0;
         // Re-borrowing the set for each step because it can also be borrowed under execute.
         while idx < self.asap_scripts_set.borrow().len() {
-            let script = self.asap_scripts_set.borrow()[idx].root();
+            let script = Root::from_ref(&*self.asap_scripts_set.borrow()[idx]);
             if !script.r().is_ready_to_be_executed() {
                 idx += 1;
                 continue;
@@ -1332,7 +1332,7 @@ impl Document {
     }
 
     pub fn get_element_by_id(&self, id: &Atom) -> Option<Root<Element>> {
-        self.idmap.borrow().get(&id).map(|ref elements| (*elements)[0].root())
+        self.idmap.borrow().get(&id).map(|ref elements| Root::from_ref(&*(*elements)[0]))
     }
 
     pub fn record_element_state_change(&self, el: &Element, which: ElementState) {
@@ -1925,7 +1925,7 @@ impl DocumentMethods for Document {
 
     // https://html.spec.whatwg.org/multipage/#dom-document-defaultview
     fn DefaultView(&self) -> Root<Window> {
-        self.window.root()
+        Root::from_ref(&*self.window)
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-document-cookie

components/script/dom/domrectlist.rs

@@ -42,7 +42,7 @@ impl DOMRectListMethods for DOMRectList {
     fn Item(&self, index: u32) -> Option<Root<DOMRect>> {
         let rects = &self.rects;
         if index < rects.len() as u32 {
-            Some(rects[index as usize].root())
+            Some(Root::from_ref(&*rects[index as usize]))
         } else {
             None
         }

components/script/dom/element.rs

@@ -874,25 +874,24 @@ impl Element {
     }
 
     pub fn get_attribute(&self, namespace: &Namespace, local_name: &Atom) -> Option<Root<Attr>> {
-        self.attrs.borrow().iter().map(JS::root).find(|attr| {
+        self.attrs.borrow().iter().find(|attr| {
             attr.local_name() == local_name && attr.namespace() == namespace
-        })
+        }).map(|js| Root::from_ref(&**js))
     }
 
     // https://dom.spec.whatwg.org/#concept-element-attributes-get-by-name
     pub fn get_attribute_by_name(&self, name: DOMString) -> Option<Root<Attr>> {
         let name = &self.parsed_name(name);
-        self.attrs.borrow().iter().map(JS::root)
-             .find(|a| a.r().name() == name)
+        self.attrs.borrow().iter().find(|a| a.name() == name).map(|js| Root::from_ref(&**js))
     }
 
     pub fn set_attribute_from_parser(&self,
                                      qname: QualName,
                                      value: DOMString,
                                      prefix: Option<Atom>) {
         // Don't set if the attribute already exists, so we can handle add_attrs_if_missing
-        if self.attrs.borrow().iter().map(JS::root)
-                .any(|a| *a.r().local_name() == qname.local && *a.r().namespace() == qname.ns) {
+        if self.attrs.borrow().iter()
+                .any(|a| *a.local_name() == qname.local && *a.namespace() == qname.ns) {
             return;
         }
 
@@ -942,7 +941,8 @@ impl Element {
                                        find: F)
                                        where F: Fn(&Attr)
                                        -> bool {
-        let attr = self.attrs.borrow().iter().map(JS::root).find(|attr| find(&attr));
+        let attr = self.attrs.borrow().iter()
+            .find(|attr| find(&attr)).map(|js| Root::from_ref(&**js));
         if let Some(attr) = attr {
             attr.set_value(value, self);
         } else {
@@ -973,10 +973,10 @@ impl Element {
     fn remove_first_matching_attribute<F>(&self, find: F) -> Option<Root<Attr>>
         where F: Fn(&Attr) -> bool
     {
-        let idx = self.attrs.borrow().iter().map(JS::root).position(|attr| find(&attr));
+        let idx = self.attrs.borrow().iter().position(|attr| find(&attr));
 
         idx.map(|idx| {
-            let attr = (*self.attrs.borrow())[idx].root();
+            let attr = Root::from_ref(&*(*self.attrs.borrow())[idx]);
             self.attrs.borrow_mut().remove(idx);
             attr.set_owner(None);
             if attr.namespace() == &ns!("") {
@@ -1005,8 +1005,8 @@ impl Element {
 
     pub fn has_attribute(&self, local_name: &Atom) -> bool {
         assert!(local_name.bytes().all(|b| b.to_ascii_lowercase() == b));
-        self.attrs.borrow().iter().map(JS::root).any(|attr| {
-            attr.r().local_name() == local_name && attr.r().namespace() == &ns!("")
+        self.attrs.borrow().iter().any(|attr| {
+            attr.local_name() == local_name && attr.namespace() == &ns!("")
         })
     }
 
@@ -1695,8 +1695,8 @@ impl<'a> ::selectors::Element for Root<Element> {
                     })
             },
             NamespaceConstraint::Any => {
-                self.attrs.borrow().iter().map(JS::root).any(|attr| {
-                     attr.local_name() == local_name && test(&attr.value())
+                self.attrs.borrow().iter().any(|attr| {
+                    attr.local_name() == local_name && test(&attr.value())
                 })
             }
         }

components/script/dom/filelist.rs

@@ -40,7 +40,7 @@ impl FileListMethods for FileList {
 
     // https://w3c.github.io/FileAPI/#dfn-item
     fn Item(&self, index: u32) -> Option<Root<File>> {
-        Some(self.list[index as usize].root())
+        Some(Root::from_ref(&*(self.list[index as usize])))
     }
 
     // check-tidy: no specs after this line

components/script/dom/formdata.rs

@@ -90,7 +90,7 @@ impl FormDataMethods for FormData {
                  .get(&name)
                  .map(|entry| match entry[0] {
                      FormDatum::StringData(ref s) => eString(s.clone()),
-                     FormDatum::FileData(ref f) => eFile(f.root()),
+                     FormDatum::FileData(ref f) => eFile(Root::from_ref(&*f)),
                  })
     }
 

components/script/dom/htmlcanvaselement.rs

@@ -153,7 +153,7 @@ impl HTMLCanvasElement {
         }
 
         match *self.context.borrow().as_ref().unwrap() {
-            CanvasContext::Context2d(ref context) => Some(context.root()),
+            CanvasContext::Context2d(ref context) => Some(Root::from_ref(&*context)),
             _   => None,
         }
     }
@@ -182,7 +182,7 @@ impl HTMLCanvasElement {
         }
 
         if let Some(CanvasContext::WebGL(ref context)) = *self.context.borrow() {
-            Some(context.root())
+            Some(Root::from_ref(&*context))
         } else {
             None
         }

components/script/dom/htmlcollection.rs

@@ -164,7 +164,7 @@ impl HTMLCollection {
 
     pub fn elements_iter(&self) -> HTMLCollectionElementsIter {
         let ref filter = self.collection.1;
-        let root = self.collection.0.root();
+        let root = Root::from_ref(&*self.collection.0);
         let mut node_iter = root.traverse_preorder();
         let _ = node_iter.next();  // skip the root node
         HTMLCollectionElementsIter {

components/script/dom/htmlelement.rs

@@ -360,8 +360,8 @@ impl HTMLElement {
 
     pub fn supported_prop_names_custom_attr(&self) -> Vec<DOMString> {
         let element = self.upcast::<Element>();
-        element.attrs().iter().map(JS::root).filter_map(|attr| {
-            let raw_name = attr.r().local_name();
+        element.attrs().iter().filter_map(|attr| {
+            let raw_name = attr.local_name();
             to_camel_case(&raw_name)
         }).collect()
     }

components/script/dom/htmlscriptelement.rs

@@ -364,7 +364,7 @@ impl HTMLScriptElement {
 
         // Step 1.
         let doc = document_from_node(self);
-        if self.parser_inserted.get() && doc.r() != self.parser_document.root().r() {
+        if self.parser_inserted.get() && &*doc != &*self.parser_document {
             return;
         }