diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-10-07 07:52:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-07 07:52:09 -0500 |
| commit | a6e4b5bb86ad707a0863acff87344ca4239cfd2c (patch) | |
| tree | c820d9f2420c44cdfe29de97f1a710e7dc354bb7 /components/script/dom/navigator.rs | |
| parent | e23959a7618e8e7b7ca20300a2afeb1ac77712f3 (diff) | |
| parent | d8e92bb271a9f9dd87bf77e38cd820d01f2f0ae4 (diff) | |
| download | servo-a6e4b5bb86ad707a0863acff87344ca4239cfd2c.tar.gz servo-a6e4b5bb86ad707a0863acff87344ca4239cfd2c.zip | |
Auto merge of #13596 - nox:inline, r=Ms2ger
Get rid of dom::bindings::global
Globals in that PR are now represented by the fake IDL interface `GlobalScope`.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13596)
<!-- Reviewable:end -->
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..bea18dfe61b 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())) } // 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())) } // 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())) } // 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()) + }) } // https://html.spec.whatwg.org/multipage/#dom-navigator-cookieenabled |