aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorSamson <16504129+sagudev@users.noreply.github.com>2023-09-11 10:23:05 +0200
committerGitHub <noreply@github.com>2023-09-11 08:23:05 +0000
commit59d134133fb5474f510dd289c212ad0e78564642 (patch)
tree65443ed51e6c0ba2e14f8fde7403ae1c521e33bd /components/script/dom
parent9b1247b20f2de6bbba39efff49eabc63e865ce2e (diff)
downloadservo-59d134133fb5474f510dd289c212ad0e78564642.tar.gz
servo-59d134133fb5474f510dd289c212ad0e78564642.zip
Use MozTools 4 and update mozjs (#30326)
* Update mozjs * moztools4 in bootstrap * no autoconf * tidy * switch to servo-build-deps * update mozjs for real * glue mozjs * fmt * move to servo/mozjs
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/bindings/conversions.rs4
-rw-r--r--components/script/dom/bindings/htmlconstructor.rs2
-rw-r--r--components/script/dom/bindings/interface.rs2
-rw-r--r--components/script/dom/bindings/utils.rs2
-rw-r--r--components/script/dom/globalscope.rs2
5 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs
index 1e5a872431d..405789f294d 100644
--- a/components/script/dom/bindings/conversions.rs
+++ b/components/script/dom/bindings/conversions.rs
@@ -356,7 +356,7 @@ pub fn is_dom_proxy(obj: *mut JSObject) -> bool {
use js::glue::IsProxyHandlerFamily;
unsafe {
let clasp = get_object_class(obj);
- ((*clasp).flags & js::JSCLASS_IS_PROXY) != 0 && IsProxyHandlerFamily(obj) != 0
+ ((*clasp).flags & js::JSCLASS_IS_PROXY) != 0 && IsProxyHandlerFamily(obj)
}
}
@@ -422,7 +422,7 @@ pub(crate) unsafe fn private_from_proto_check(
let dom_class = get_dom_class(obj).or_else(|_| {
if IsWrapper(obj) {
trace!("found wrapper");
- obj = UnwrapObjectDynamic(obj, cx, /* stopAtWindowProxy = */ 0);
+ obj = UnwrapObjectDynamic(obj, cx, /* stopAtWindowProxy = */ false);
if obj.is_null() {
trace!("unwrapping security wrapper failed");
Err(())
diff --git a/components/script/dom/bindings/htmlconstructor.rs b/components/script/dom/bindings/htmlconstructor.rs
index 9a2c037de46..5eb79e28e1b 100644
--- a/components/script/dom/bindings/htmlconstructor.rs
+++ b/components/script/dom/bindings/htmlconstructor.rs
@@ -113,7 +113,7 @@ unsafe fn html_constructor(
// The new_target might be a cross-compartment wrapper. Get the underlying object
// so we can do the spec's object-identity checks.
- rooted!(in(*cx) let new_target_unwrapped = UnwrapObjectDynamic(call_args.new_target().to_object(), *cx, 1));
+ rooted!(in(*cx) let new_target_unwrapped = UnwrapObjectDynamic(call_args.new_target().to_object(), *cx, true));
if new_target_unwrapped.is_null() {
throw_dom_exception(cx, global, Error::Type("new.target is null".to_owned()));
return Err(());
diff --git a/components/script/dom/bindings/interface.rs b/components/script/dom/bindings/interface.rs
index 13658ca6410..0874881deec 100644
--- a/components/script/dom/bindings/interface.rs
+++ b/components/script/dom/bindings/interface.rs
@@ -431,7 +431,7 @@ pub fn define_guarded_properties(
/// be exposed in the global object `obj`.
pub fn is_exposed_in(object: HandleObject, globals: Globals) -> bool {
unsafe {
- let unwrapped = UncheckedUnwrapObject(object.get(), /* stopAtWindowProxy = */ 0);
+ let unwrapped = UncheckedUnwrapObject(object.get(), /* stopAtWindowProxy = */ false);
let dom_class = get_dom_class(unwrapped).unwrap();
globals.contains(dom_class.global)
}
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index 7557f4a3fa8..d7d274dc701 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -278,7 +278,7 @@ pub unsafe fn find_enum_value<'a, T>(
/// <https://heycam.github.io/webidl/#dfn-platform-object>
pub fn is_platform_object_dynamic(obj: *mut JSObject, cx: *mut JSContext) -> bool {
is_platform_object(obj, &|o| unsafe {
- UnwrapObjectDynamic(o, cx, /* stopAtWindowProxy = */ 0)
+ UnwrapObjectDynamic(o, cx, /* stopAtWindowProxy = */ false)
})
}
diff --git a/components/script/dom/globalscope.rs b/components/script/dom/globalscope.rs
index ed082c0f4b9..2ac4aacd70f 100644
--- a/components/script/dom/globalscope.rs
+++ b/components/script/dom/globalscope.rs
@@ -2174,7 +2174,7 @@ impl GlobalScope {
cx: *mut JSContext,
) -> DomRoot<Self> {
if IsWrapper(obj) {
- obj = UnwrapObjectDynamic(obj, cx, /* stopAtWindowProxy = */ 0);
+ obj = UnwrapObjectDynamic(obj, cx, /* stopAtWindowProxy = */ false);
assert!(!obj.is_null());
}
GlobalScope::from_object(obj)