aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/bindings/reflector.rs14
-rw-r--r--components/script/dom/stylesheet.rs4
2 files changed, 14 insertions, 4 deletions
diff --git a/components/script/dom/bindings/reflector.rs b/components/script/dom/bindings/reflector.rs
index 0a5afbce487..c888686974e 100644
--- a/components/script/dom/bindings/reflector.rs
+++ b/components/script/dom/bindings/reflector.rs
@@ -11,7 +11,7 @@ use crate::DomTypes;
use crate::dom::bindings::conversions::DerivedFrom;
use crate::dom::bindings::root::DomRoot;
use crate::dom::globalscope::GlobalScope;
-use crate::realms::InRealm;
+use crate::realms::{InRealm, enter_realm};
use crate::script_runtime::CanGc;
/// Create the reflector for a new DOM object and yield ownership to the
@@ -42,7 +42,16 @@ where
}
pub(crate) trait DomGlobal {
+ /// Returns the [relevant global] in whatever realm is currently active.
+ ///
+ /// [relevant global]: https://html.spec.whatwg.org/multipage/#concept-relevant-global
fn global_(&self, realm: InRealm) -> DomRoot<GlobalScope>;
+
+ /// Returns the [relevant global] in the same realm as the callee object.
+ /// If you know the callee's realm is already the current realm, it is
+ /// more efficient to call [DomGlobal::global_] instead.
+ ///
+ /// [relevant global]: https://html.spec.whatwg.org/multipage/#concept-relevant-global
fn global(&self) -> DomRoot<GlobalScope>;
}
@@ -51,7 +60,8 @@ impl<T: DomGlobalGeneric<crate::DomTypeHolder>> DomGlobal for T {
<Self as DomGlobalGeneric<crate::DomTypeHolder>>::global_(self, realm)
}
fn global(&self) -> DomRoot<GlobalScope> {
- <Self as DomGlobalGeneric<crate::DomTypeHolder>>::global(self)
+ let realm = enter_realm(self);
+ <Self as DomGlobalGeneric<crate::DomTypeHolder>>::global_(self, InRealm::entered(&realm))
}
}
diff --git a/components/script/dom/stylesheet.rs b/components/script/dom/stylesheet.rs
index bf708685426..8bb6faa0c90 100644
--- a/components/script/dom/stylesheet.rs
+++ b/components/script/dom/stylesheet.rs
@@ -39,8 +39,8 @@ impl StyleSheet {
}
impl StyleSheetMethods<crate::DomTypeHolder> for StyleSheet {
- // https://drafts.csswg.org/cssom/#dom-stylesheet-type
- fn Type_(&self) -> DOMString {
+ /// <https://drafts.csswg.org/cssom/#dom-stylesheet-type>
+ fn Type(&self) -> DOMString {
self.type_.clone()
}