diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2016-09-27 13:16:41 +0200 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2016-10-06 20:59:09 +0200 |
| commit | fcb59d305742a18daa083352a9b6e9a45896c9f6 (patch) | |
| tree | d1023c24bfb5827c49d4d4653a72541b66532b95 /components/script/dom/navigator.rs | |
| parent | 093b189b4800909b17295b88aed762601f4b8482 (diff) | |
| download | servo-fcb59d305742a18daa083352a9b6e9a45896c9f6.tar.gz servo-fcb59d305742a18daa083352a9b6e9a45896c9f6.zip | |
Make reflect_dom_object take a &GlobalScope
Diffstat (limited to 'components/script/dom/navigator.rs')
| -rw-r--r-- | components/script/dom/navigator.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/components/script/dom/navigator.rs b/components/script/dom/navigator.rs index ce97c30ae60..d4e4629e486 100644 --- a/components/script/dom/navigator.rs +++ b/components/script/dom/navigator.rs @@ -4,7 +4,6 @@ use dom::bindings::codegen::Bindings::NavigatorBinding; use dom::bindings::codegen::Bindings::NavigatorBinding::NavigatorMethods; -use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, MutNullableHeap, Root}; use dom::bindings::reflector::{Reflector, Reflectable, reflect_dom_object}; use dom::bindings::str::DOMString; @@ -37,7 +36,7 @@ impl Navigator { pub fn new(window: &Window) -> Root<Navigator> { reflect_dom_object(box Navigator::new_inherited(), - GlobalRef::Window(window), + window, NavigatorBinding::Wrap) } } @@ -80,7 +79,7 @@ impl NavigatorMethods for Navigator { // https://webbluetoothcg.github.io/web-bluetooth/#dom-navigator-bluetooth fn Bluetooth(&self) -> Root<Bluetooth> { - self.bluetooth.or_init(|| Bluetooth::new(self.global().r())) + self.bluetooth.or_init(|| Bluetooth::new(self.global().r().as_global_scope())) } // https://html.spec.whatwg.org/multipage/#navigatorlanguage @@ -90,12 +89,12 @@ impl NavigatorMethods for Navigator { // https://html.spec.whatwg.org/multipage/#dom-navigator-plugins fn Plugins(&self) -> Root<PluginArray> { - self.plugins.or_init(|| PluginArray::new(self.global().r())) + self.plugins.or_init(|| PluginArray::new(self.global().r().as_global_scope())) } // https://html.spec.whatwg.org/multipage/#dom-navigator-mimetypes fn MimeTypes(&self) -> Root<MimeTypeArray> { - self.mime_types.or_init(|| MimeTypeArray::new(self.global().r())) + self.mime_types.or_init(|| MimeTypeArray::new(self.global().r().as_global_scope())) } // https://html.spec.whatwg.org/multipage/#dom-navigator-javaenabled @@ -105,7 +104,9 @@ impl NavigatorMethods for Navigator { // https://w3c.github.io/ServiceWorker/#navigator-service-worker-attribute fn ServiceWorker(&self) -> Root<ServiceWorkerContainer> { - self.service_worker.or_init(|| ServiceWorkerContainer::new(self.global().r())) + self.service_worker.or_init(|| { + ServiceWorkerContainer::new(self.global().r().as_global_scope()) + }) } // https://html.spec.whatwg.org/multipage/#dom-navigator-cookieenabled |