1 files changed, 16 insertions, 17 deletions
diff --git a/components/script/dom/client.rs b/components/script/dom/client.rs
index 7910ffc8dfa..2768ee7c9ba 100644
--- a/components/script/dom/client.rs
+++ b/components/script/dom/client.rs
@@ -1,14 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use dom::bindings::codegen::Bindings::ClientBinding::{ClientMethods, Wrap};
-use dom::bindings::codegen::Bindings::ClientBinding::FrameType;
-use dom::bindings::js::{Root, MutNullableJS};
-use dom::bindings::reflector::{Reflector, reflect_dom_object};
-use dom::bindings::str::{DOMString, USVString};
-use dom::serviceworker::ServiceWorker;
-use dom::window::Window;
+use crate::dom::bindings::codegen::Bindings::ClientBinding::ClientMethods;
+use crate::dom::bindings::codegen::Bindings::ClientBinding::FrameType;
+use crate::dom::bindings::reflector::{reflect_dom_object, Reflector};
+use crate::dom::bindings::root::{DomRoot, MutNullableDom};
+use crate::dom::bindings::str::{DOMString, USVString};
+use crate::dom::serviceworker::ServiceWorker;
+use crate::dom::window::Window;
 use dom_struct::dom_struct;
 use servo_url::ServoUrl;
 use std::default::Default;
@@ -17,11 +17,11 @@ use uuid::Uuid;
 #[dom_struct]
 pub struct Client {
     reflector_: Reflector,
-    active_worker: MutNullableJS<ServiceWorker>,
+    active_worker: MutNullableDom<ServiceWorker>,
     url: ServoUrl,
     frame_type: FrameType,
-    #[ignore_heap_size_of = "Defined in uuid"]
-    id: Uuid
+    #[ignore_malloc_size_of = "Defined in uuid"]
+    id: Uuid,
 }
 
 impl Client {
@@ -31,24 +31,23 @@ impl Client {
             active_worker: Default::default(),
             url: url,
             frame_type: FrameType::None,
-            id: Uuid::new_v4()
+            id: Uuid::new_v4(),
         }
     }
 
-    pub fn new(window: &Window) -> Root<Client> {
-        reflect_dom_object(box Client::new_inherited(window.get_url()),
-                           window,
-                           Wrap)
+    pub fn new(window: &Window) -> DomRoot<Client> {
+        reflect_dom_object(Box::new(Client::new_inherited(window.get_url())), window)
     }
 
     pub fn creation_url(&self) -> ServoUrl {
         self.url.clone()
     }
 
-    pub fn get_controller(&self) -> Option<Root<ServiceWorker>> {
+    pub fn get_controller(&self) -> Option<DomRoot<ServiceWorker>> {
         self.active_worker.get()
     }
 
+    #[allow(dead_code)]
     pub fn set_controller(&self, worker: &ServiceWorker) {
         self.active_worker.set(Some(worker));
     }