Remove intrinsic Root::r()

1 files changed, 6 insertions, 6 deletions

diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs
index 7dc89cc610e..4825ce6a2a8 100644
--- a/components/script/dom/htmlselectelement.rs
+++ b/components/script/dom/htmlselectelement.rs
@@ -49,7 +49,7 @@ impl CollectionFilter for OptionsFilter {
 
         match node.GetParentNode() {
             Some(optgroup) =>
-                optgroup.is::<HTMLOptGroupElement>() && root.is_parent_of(optgroup.r()),
+                optgroup.is::<HTMLOptGroupElement>() && root.is_parent_of(&optgroup),
             None => false,
         }
     }
@@ -97,11 +97,11 @@ impl HTMLSelectElement {
         for opt in node.traverse_preorder().filter_map(Root::downcast::<HTMLOptionElement>) {
             if opt.Selected() {
                 opt.set_selectedness(false);
-                last_selected = Some(Root::from_ref(opt.r()));
+                last_selected = Some(Root::from_ref(&opt));
             }
             let element = opt.upcast::<Element>();
             if first_enabled.is_none() && !element.disabled_state() {
-                first_enabled = Some(Root::from_ref(opt.r()));
+                first_enabled = Some(Root::from_ref(&opt));
             }
         }
 
@@ -164,7 +164,7 @@ impl HTMLSelectElementMethods for HTMLSelectElement {
     // https://html.spec.whatwg.org/multipage/#dom-cva-validity
     fn Validity(&self) -> Root<ValidityState> {
         let window = window_from_node(self);
-        ValidityState::new(window.r(), self.upcast())
+        ValidityState::new(&window, self.upcast())
     }
 
     // Note: this function currently only exists for union.html.
@@ -219,8 +219,8 @@ impl HTMLSelectElementMethods for HTMLSelectElement {
     fn Options(&self) -> Root<HTMLOptionsCollection> {
         self.options.or_init(|| {
             let window = window_from_node(self);
-            HTMLOptionsCollection::new(window.r(),
-                        self.upcast(), box OptionsFilter)
+            HTMLOptionsCollection::new(
+                &window, self.upcast(), box OptionsFilter)
         })
     }