mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Make reflect_dom_object take a &GlobalScope
This commit is contained in:
parent
093b189b48
commit
fcb59d3057
132 changed files with 488 additions and 407 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue