Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

perf(renderer): compact DOM wrapper identities

ldm0ad61e00ff1d0
diff --git a/moli-renderer-v8/src/host_bindings.rs b/moli-renderer-v8/src/host_bindings.rs
index 4dc83b470..20f2b34b1 100644
--- a/moli-renderer-v8/src/host_bindings.rs
+++ b/moli-renderer-v8/src/host_bindings.rs
@@ -10,7 +10,6 @@ use moli_webapi_declare::WebApiObject;
use super::{
document_runtime::DomHandle,
native_bridge::JsContextHost,
- reflector::ReflectorId,
util::{callback_arg_string, serialize_v8_array, v8_string, v8str},
};
use crate::{context_bootstrap::CHILD_BROWSING_CONTEXT_HANDLE_SLOT, util::get_private_value};
@@ -164,19 +163,8 @@ fn callback_value_dom_handle(
return default_document.then(|| host.document_handle());
}
- if let Ok(object) = v8::Local::<v8::Object>::try_from(value)
- && let Some(handle_value) = object.get_internal_field(scope, 1)
- && let Ok(handle_value) = v8::Local::<v8::Value>::try_from(handle_value)
- && let Some(handle_number) = handle_value.number_value(scope)
- && handle_number.is_finite()
- && handle_number.fract() == 0.0
- && handle_number > 0.0
- && let Some(handle) =
- host.resolve_node_wrapper_handle(ReflectorId::from_raw(handle_number as u64))
- {
- return Some(handle);
- }
- None
+ let handle = crate::native_bridge::callback_value_dom_handle(scope, value)?;
+ host.dom_host().node(handle).map(|_| handle)
}
fn callback_arg_dom_handle(
diff --git a/moli-renderer-v8/src/native_bridge/bindings.rs b/moli-renderer-v8/src/native_bridge/bindings.rs
index 93d741b49..d3b6731dc 100644
--- a/moli-renderer-v8/src/native_bridge/bindings.rs
+++ b/moli-renderer-v8/src/native_bridge/bindings.rs
@@ -239,16 +239,32 @@ impl NativeBridgeBindings {
let wrapper = template
.new_instance(scope)
.unwrap_or_else(|| panic!("failed to instantiate `{prototype_name}` wrapper"));
- let host_external = v8::External::new(scope, host_ptr as *mut c_void);
- assert!(
- wrapper.set_internal_field(0, host_external.into()),
- "`{prototype_name}` wrapper must expose its runtime field"
- );
- // Field 1 stores a reflector-backed identity id rather than the raw DomHandle.
- assert!(
- wrapper.set_internal_field(1, v8::Number::new(scope, reflector_id.raw() as f64).into()),
- "`{prototype_name}` wrapper must expose its reflector identity field"
- );
+ if matches!(wrapper_kind, WrapperKind::Window) {
+ // Window brand checks can cross realm boundaries, so the small
+ // number of Window wrappers retain their object-local host marker.
+ let host_external = v8::External::new(scope, host_ptr as *mut c_void);
+ assert!(
+ wrapper.set_internal_field(0, host_external.into()),
+ "Window wrapper must expose its runtime field"
+ );
+ assert!(
+ wrapper.set_internal_field(
+ 1,
+ v8::Number::new(scope, reflector_id.raw() as f64).into(),
+ ),
+ "Window wrapper must expose its reflector identity field"
+ );
+ } else {
+ // The owning host is already installed in every live V8 context.
+ // High-cardinality DOM wrappers therefore keep only their identity.
+ assert!(
+ wrapper.set_internal_field(
+ 0,
+ v8::Number::new(scope, reflector_id.raw() as f64).into(),
+ ),
+ "`{prototype_name}` wrapper must expose its reflector identity field"
+ );
+ }
set_named_constructor_prototype(scope, wrapper, prototype_name);
self.sync_wrapper_owner_realm_prototype(scope, host_ptr, &handle, wrapper);
if matches!(wrapper_kind, WrapperKind::Node) {
@@ -325,7 +341,7 @@ impl NativeBridgeBindings {
);
assert!(
wrapper.set_internal_field(1, v8::Number::new(scope, 0.0).into()),
- "synthetic Window wrapper must expose its identity field"
+ "synthetic Window wrapper must expose its shell marker"
);
set_named_constructor_prototype(scope, wrapper, "Window");
wrapper
diff --git a/moli-renderer-v8/src/native_bridge/bindings/node_template.rs b/moli-renderer-v8/src/native_bridge/bindings/node_template.rs
index e0b4a0798..34a6c3cb4 100644
--- a/moli-renderer-v8/src/native_bridge/bindings/node_template.rs
+++ b/moli-renderer-v8/src/native_bridge/bindings/node_template.rs
@@ -13,7 +13,7 @@ pub(super) fn build_node_wrapper_template<'s, 'i>(
descriptor: &BridgeDescriptor,
) -> v8::Local<'s, v8::ObjectTemplate> {
let template = v8::ObjectTemplate::new(scope);
- let _ = template.set_internal_field_count(2);
+ let _ = template.set_internal_field_count(1);
node_accessors::install_node_accessors(scope, template, descriptor);
document_accessors::install_document_accessors(scope, template, descriptor);
diff --git a/moli-renderer-v8/src/native_bridge/bridge/wrappers.rs b/moli-renderer-v8/src/native_bridge/bridge/wrappers.rs
index 43b1b4edc..9bb06ddfd 100644
--- a/moli-renderer-v8/src/native_bridge/bridge/wrappers.rs
+++ b/moli-renderer-v8/src/native_bridge/bridge/wrappers.rs
@@ -1,6 +1,4 @@
-use super::super::{
- BridgeHandle, ComputedStyleDescriptor, DomTokenListKind, JsContextHost, ReflectorId,
-};
+use super::super::{BridgeHandle, ComputedStyleDescriptor, DomTokenListKind, JsContextHost};
use super::NativeDomBridge;
use crate::document_runtime::DomHandle;
@@ -155,21 +153,7 @@ impl NativeDomBridge {
self.wrap_bridge_handle(
scope,
runtime_ptr,
- BridgeHandle::ComputedStyle(handle, descriptor),
+ BridgeHandle::ComputedStyle(handle, std::rc::Rc::new(descriptor)),
)
}
-
- pub(crate) fn resolve_node_handle(&self, reflector_id: ReflectorId) -> Option<DomHandle> {
- match self.bridge_handle(reflector_id) {
- Some(BridgeHandle::Node(handle)) => Some(handle),
- Some(
- BridgeHandle::Window
- | BridgeHandle::ClassList(_, _)
- | BridgeHandle::Dataset(_)
- | BridgeHandle::Style(_)
- | BridgeHandle::ComputedStyle(_, _),
- )
- | None => None,
- }
- }
}
diff --git a/moli-renderer-v8/src/native_bridge/context_host/core.rs b/moli-renderer-v8/src/native_bridge/context_host/core.rs
index e2697badc..752aec446 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/core.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/core.rs
@@ -2351,13 +2351,6 @@ impl JsContextHost {
&mut self.text_codecs
}
- pub(crate) fn resolve_node_wrapper_handle(
- &self,
- reflector_id: ReflectorId,
- ) -> Option<DomHandle> {
- self.bridge.resolve_node_handle(reflector_id)
- }
-
pub(crate) fn renderer_backend_node_id_for_live_handle(
&mut self,
handle: DomHandle,
diff --git a/moli-renderer-v8/src/native_bridge/context_host/mod.rs b/moli-renderer-v8/src/native_bridge/context_host/mod.rs
index db6601508..4cff7952f 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/mod.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/mod.rs
@@ -26,7 +26,6 @@ use crate::{
native_bridge::{bindings::NativeBridgeBindings, element::ClientRect},
observer_runtime::{ObserverStore, ObserverStoreAccessToken},
page_task_queue::RendererResourceCompletionSender,
- reflector::ReflectorId,
renderer_resource_scheduler::RendererResourceScheduler,
runtime::{
RendererBrowserContextRuntime, RendererDocumentLifecycleJournalHandle,
diff --git a/moli-renderer-v8/src/native_bridge/element/class_list/template.rs b/moli-renderer-v8/src/native_bridge/element/class_list/template.rs
index f0ed75bf5..709fd0a8a 100644
--- a/moli-renderer-v8/src/native_bridge/element/class_list/template.rs
+++ b/moli-renderer-v8/src/native_bridge/element/class_list/template.rs
@@ -86,7 +86,7 @@ pub(in crate::native_bridge) fn build_dom_token_list_wrapper_template<'s, 'i>(
scope: &mut v8::PinScope<'s, 'i, ()>,
) -> v8::Local<'s, v8::ObjectTemplate> {
let template = v8::ObjectTemplate::new(scope);
- let _ = template.set_internal_field_count(2);
+ let _ = template.set_internal_field_count(1);
template.set_indexed_property_handler(
v8::IndexedPropertyHandlerConfiguration::new()
.getter(indexed::class_list_indexed_getter)
diff --git a/moli-renderer-v8/src/native_bridge/element/dataset.rs b/moli-renderer-v8/src/native_bridge/element/dataset.rs
index 467ff19c1..ae227f836 100644
--- a/moli-renderer-v8/src/native_bridge/element/dataset.rs
+++ b/moli-renderer-v8/src/native_bridge/element/dataset.rs
@@ -15,7 +15,7 @@ pub(in crate::native_bridge) fn build_dom_string_map_wrapper_template<'s, 'i>(
scope: &mut v8::PinScope<'s, 'i, ()>,
) -> v8::Local<'s, v8::ObjectTemplate> {
let template = v8::ObjectTemplate::new(scope);
- let _ = template.set_internal_field_count(2);
+ let _ = template.set_internal_field_count(1);
template.set_indexed_property_handler(
v8::IndexedPropertyHandlerConfiguration::new()
.getter(dataset_indexed_getter)
diff --git a/moli-renderer-v8/src/native_bridge/element/styles.rs b/moli-renderer-v8/src/native_bridge/element/styles.rs
index 1715d0e3d..4dcfb3999 100644
--- a/moli-renderer-v8/src/native_bridge/element/styles.rs
+++ b/moli-renderer-v8/src/native_bridge/element/styles.rs
@@ -900,7 +900,7 @@ pub(in crate::native_bridge) fn build_style_wrapper_template<'s, 'i>(
scope: &mut v8::PinScope<'s, 'i, ()>,
) -> v8::Local<'s, v8::ObjectTemplate> {
let template = v8::ObjectTemplate::new(scope);
- let _ = template.set_internal_field_count(2);
+ let _ = template.set_internal_field_count(1);
template.set_indexed_property_handler(
v8::IndexedPropertyHandlerConfiguration::new()
.getter(style_indexed_getter)
diff --git a/moli-renderer-v8/src/native_bridge/helpers/identity.rs b/moli-renderer-v8/src/native_bridge/helpers/identity.rs
index 380e98c07..6e9a7b1de 100644
--- a/moli-renderer-v8/src/native_bridge/helpers/identity.rs
+++ b/moli-renderer-v8/src/native_bridge/helpers/identity.rs
@@ -1,11 +1,19 @@
-use super::super::{BridgeHandle, JsContextHost, ReflectorId, runtime_ptr_from_object};
+use super::super::{BridgeHandle, JsContextHost, ReflectorId};
+use crate::util::context_host_ptr_from_global_bridge;
fn object_reflector_id(
scope: &mut v8::PinScope<'_, '_>,
object: v8::Local<'_, v8::Object>,
) -> std::result::Result<ReflectorId, String> {
+ let field_index = match object.internal_field_count() {
+ 1 => 0,
+ // Window wrappers retain their host pointer in field 0 because Window
+ // brand checks can cross realm boundaries.
+ 2 => 1,
+ _ => return Err("wrapper had an invalid reflector field count".to_owned()),
+ };
let value = object
- .get_internal_field(scope, 1)
+ .get_internal_field(scope, field_index)
.ok_or_else(|| "wrapper missing reflector field".to_owned())?;
let value = v8::Local::<v8::Value>::try_from(value)
.map_err(|_| "wrapper reflector field had invalid type".to_owned())?;
@@ -22,7 +30,8 @@ pub(in crate::native_bridge) fn bridge_handle_from_object(
scope: &mut v8::PinScope<'_, '_>,
object: v8::Local<'_, v8::Object>,
) -> std::result::Result<(*mut JsContextHost, BridgeHandle), String> {
- let runtime_ptr = runtime_ptr_from_object(scope, object)?;
+ let runtime_ptr = context_host_ptr_from_global_bridge(scope)
+ .ok_or_else(|| "wrapper context was missing its native host".to_owned())?;
let reflector_id = object_reflector_id(scope, object)?;
let handle = unsafe { &*runtime_ptr }
.native_bridge()
diff --git a/moli-renderer-v8/src/native_bridge/identity.rs b/moli-renderer-v8/src/native_bridge/identity.rs
index 4b389f355..db4d0a551 100644
--- a/moli-renderer-v8/src/native_bridge/identity.rs
+++ b/moli-renderer-v8/src/native_bridge/identity.rs
@@ -2,6 +2,7 @@ use std::{
cell::RefCell,
collections::HashMap,
hash::{Hash, Hasher},
+ num::NonZeroU64,
rc::Rc,
};
@@ -19,7 +20,7 @@ pub(super) enum BridgeHandle {
ClassList(DomHandle, DomTokenListKind),
Dataset(DomHandle),
Style(DomHandle),
- ComputedStyle(DomHandle, ComputedStyleDescriptor),
+ ComputedStyle(DomHandle, Rc<ComputedStyleDescriptor>),
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -389,17 +390,116 @@ impl StaticHandleCollectionStore {
#[derive(Debug, Default)]
struct BridgeContextWrapperCache {
- wrappers: HashMap<ReflectorId, BridgeCachedWrapper>,
+ wrappers: DenseReflectorMap<BridgeCachedWrapper>,
live_collection_wrappers: HashMap<LiveCollectionDescriptor, BridgeCachedWrapper>,
}
+const MAX_DENSE_REFLECTOR_ID_GAP: u64 = 64;
+
+#[derive(Debug)]
+struct DenseReflectorMap<V> {
+ dense_base: Option<u64>,
+ dense: Vec<Option<V>>,
+ sparse: HashMap<ReflectorId, V>,
+}
+
+impl<V> Default for DenseReflectorMap<V> {
+ fn default() -> Self {
+ Self {
+ dense_base: None,
+ dense: Vec::new(),
+ sparse: HashMap::new(),
+ }
+ }
+}
+
+impl<V> DenseReflectorMap<V> {
+ fn dense_index(&self, id: ReflectorId) -> Option<usize> {
+ let offset = id.raw().checked_sub(self.dense_base?)?;
+ let index = usize::try_from(offset).ok()?;
+ (index < self.dense.len()).then_some(index)
+ }
+
+ fn get(&self, id: &ReflectorId) -> Option<&V> {
+ self.dense_index(*id)
+ .and_then(|index| self.dense[index].as_ref())
+ .or_else(|| self.sparse.get(id))
+ }
+
+ fn insert(&mut self, id: ReflectorId, value: V) -> Option<V> {
+ let raw = id.raw();
+ let base = self.dense_base.get_or_insert(raw);
+ let dense_end = base.saturating_add(self.dense.len() as u64);
+ if raw >= *base && raw <= dense_end.saturating_add(MAX_DENSE_REFLECTOR_ID_GAP) {
+ let index = usize::try_from(raw - *base).expect("dense reflector index overflow");
+ if index >= self.dense.len() {
+ self.dense.resize_with(index + 1, || None);
+ }
+ let sparse = self.sparse.remove(&id);
+ return self.dense[index].replace(value).or(sparse);
+ }
+ self.sparse.insert(id, value)
+ }
+
+ fn clear(&mut self) {
+ self.dense_base = None;
+ self.dense.clear();
+ self.sparse.clear();
+ }
+
+ fn retain(&mut self, mut keep: impl FnMut(ReflectorId, &mut V) -> bool) {
+ if let Some(base) = self.dense_base {
+ for (index, slot) in self.dense.iter_mut().enumerate() {
+ let Some(value) = slot.as_mut() else {
+ continue;
+ };
+ let raw = base
+ .checked_add(index as u64)
+ .expect("dense reflector id overflow");
+ if !keep(ReflectorId::from_raw(raw), value) {
+ *slot = None;
+ }
+ }
+ if let Some(first_live) = self.dense.iter().position(Option::is_some) {
+ if first_live != 0 {
+ self.dense.drain(..first_live);
+ self.dense_base = Some(
+ base.checked_add(first_live as u64)
+ .expect("dense reflector id overflow"),
+ );
+ }
+ let retained_len = self
+ .dense
+ .iter()
+ .rposition(Option::is_some)
+ .map_or(0, |index| index + 1);
+ self.dense.truncate(retained_len);
+ } else {
+ self.dense.clear();
+ self.dense_base = None;
+ }
+ }
+ self.sparse.retain(|id, value| keep(*id, value));
+ }
+
+ #[cfg(test)]
+ fn len(&self) -> usize {
+ self.dense.iter().flatten().count() + self.sparse.len()
+ }
+
+ #[cfg(test)]
+ fn values(&self) -> impl Iterator<Item = &V> {
+ self.dense.iter().flatten().chain(self.sparse.values())
+ }
+}
+
#[derive(Debug)]
struct SharedDefaultWorldWrapperCache;
#[derive(Debug)]
struct BridgeCachedWrapper {
wrapper: v8::Global<v8::Object>,
- creation_realm: Option<RuntimeObservableContextToken>,
+ creation_realm: Option<NonZeroU64>,
}
impl BridgeCachedWrapper {
@@ -410,7 +510,8 @@ impl BridgeCachedWrapper {
.get_current_context()
.get_slot::<RuntimeObservableContextToken>()
.as_deref()
- .copied(),
+ .copied()
+ .and_then(|token| NonZeroU64::new(token.as_u64())),
}
}
}
@@ -471,7 +572,7 @@ impl BridgeContextWrapperCacheRetainForTest {
.borrow()
.wrappers
.values()
- .filter(|entry| entry.creation_realm == Some(realm_token))
+ .filter(|entry| entry.creation_realm.map(NonZeroU64::get) == Some(realm_token.as_u64()))
.count()
}
}
@@ -607,12 +708,12 @@ impl BridgeIdentityStore {
realm_token: RuntimeObservableContextToken,
) {
let mut cache = self.default_world_wrapper_cache.borrow_mut();
- cache
- .wrappers
- .retain(|_, entry| entry.creation_realm != Some(realm_token));
- cache
- .live_collection_wrappers
- .retain(|_, entry| entry.creation_realm != Some(realm_token));
+ cache.wrappers.retain(|_, entry| {
+ entry.creation_realm.map(NonZeroU64::get) != Some(realm_token.as_u64())
+ });
+ cache.live_collection_wrappers.retain(|_, entry| {
+ entry.creation_realm.map(NonZeroU64::get) != Some(realm_token.as_u64())
+ });
}
pub(super) fn register_static_handle_collection(&mut self, handles: Vec<DomHandle>) -> u32 {
@@ -632,3 +733,47 @@ impl BridgeIdentityStore {
.handle_at(collection_id, index)
}
}
+
+#[cfg(test)]
+mod tests {
+ use std::mem::size_of;
+
+ use super::{BridgeCachedWrapper, BridgeHandle, DenseReflectorMap, ReflectorId};
+
+ #[test]
+ fn bridge_handle_stays_compact_for_per_wrapper_identity_tables() {
+ #[cfg(target_pointer_width = "64")]
+ assert_eq!(size_of::<BridgeHandle>(), 16);
+ #[cfg(target_pointer_width = "32")]
+ assert!(size_of::<BridgeHandle>() <= 3 * size_of::<usize>());
+ }
+
+ #[test]
+ fn cached_wrapper_entry_uses_the_global_handle_niche() {
+ #[cfg(target_pointer_width = "64")]
+ assert_eq!(size_of::<BridgeCachedWrapper>(), 24);
+ }
+
+ #[test]
+ fn dense_reflector_map_keeps_sequential_ids_dense_and_large_gaps_sparse() {
+ let mut entries = DenseReflectorMap::default();
+ assert_eq!(entries.insert(ReflectorId::from_raw(50_000), 1_u32), None);
+ assert_eq!(entries.insert(ReflectorId::from_raw(50_001), 2_u32), None);
+ assert_eq!(entries.insert(ReflectorId::from_raw(100_000), 3_u32), None);
+
+ assert_eq!(entries.dense_base, Some(50_000));
+ assert_eq!(entries.dense.len(), 2);
+ assert_eq!(entries.sparse.len(), 1);
+ assert_eq!(entries.get(&ReflectorId::from_raw(50_001)), Some(&2));
+ assert_eq!(entries.get(&ReflectorId::from_raw(100_000)), Some(&3));
+ assert_eq!(entries.len(), 3);
+
+ entries.retain(|id, _| id.raw() != 50_000);
+ assert_eq!(entries.dense_base, Some(50_001));
+ assert_eq!(entries.values().copied().collect::<Vec<_>>(), vec![2, 3]);
+
+ entries.clear();
+ assert_eq!(entries.len(), 0);
+ assert_eq!(entries.dense_base, None);
+ }
+}
diff --git a/moli-renderer-v8/src/native_bridge/node/tree/methods.rs b/moli-renderer-v8/src/native_bridge/node/tree/methods.rs
index 030ac9d47..52a6bb1a5 100644
--- a/moli-renderer-v8/src/native_bridge/node/tree/methods.rs
+++ b/moli-renderer-v8/src/native_bridge/node/tree/methods.rs
@@ -127,8 +127,8 @@ pub(in crate::native_bridge) fn node_compare_document_position_callback<'s>(
// We must NOT take this branch for arbitrary JS objects (`{}`, Arrays,
// etc.) — WebIDL requires throwing TypeError when the argument isn't a
// Node. is_node_like_object below is the discriminator: it accepts
- // either a live Node wrapper (internal field 0 == Node-shaped
- // BridgeHandle) or a detached-doc node wrapper (has the
+ // either a live Node wrapper (one internal reflector-id field) or a
+ // detached-doc node wrapper (has the
// __moliDetachedState private slot, which only detached node
// builders set).
let other_value = args.get(0);
@@ -164,7 +164,7 @@ fn is_node_like_object<'s>(
object: v8::Local<'s, v8::Object>,
) -> bool {
use crate::util::get_private_object;
- // Live wrapper: internal field 0 is a Node-shaped BridgeHandle. The
+ // Live wrapper: its sole internal field is a reflector identity. The
// existing helper distinguishes Node wrappers from Window / ClassList /
// Style / etc., so we only need to know that it succeeds.
if node_runtime_and_handle_from_object(scope, object).is_ok() {
diff --git a/moli-renderer-v8/src/native_bridge/window.rs b/moli-renderer-v8/src/native_bridge/window.rs
index aa6e5f69f..9dda688db 100644
--- a/moli-renderer-v8/src/native_bridge/window.rs
+++ b/moli-renderer-v8/src/native_bridge/window.rs
@@ -7,6 +7,10 @@ pub(super) fn build_window_wrapper_template<'s, 'i>(
scope: &mut v8::PinScope<'s, 'i, ()>,
) -> v8::Local<'s, v8::ObjectTemplate> {
let template = v8::ObjectTemplate::new(scope);
+ // Unlike the high-cardinality Node wrappers, Window wrappers retain an
+ // object-local host pointer for cross-realm WebIDL brand checks. Field 1
+ // distinguishes a reflected Window (positive id) from a synthetic shell
+ // (zero).
let _ = template.set_internal_field_count(2);
// Synthetic same-origin Window wrappers (for example the lightweight
// popup shell) are concrete Window objects too. They cannot inherit the
diff --git a/moli-renderer-v8/src/util.rs b/moli-renderer-v8/src/util.rs
index 64f13c686..63b7cf7de 100644
--- a/moli-renderer-v8/src/util.rs
+++ b/moli-renderer-v8/src/util.rs
@@ -338,7 +338,7 @@ pub(super) fn call_global_bridge_method<'s>(
/// The returned pointer is valid for the duration of the V8 callback because the
/// owning ScriptVm page state keeps a Rust-side `Rc`, and each live V8 context
/// owns an additional bridge-ref token for the ref-count stored in the native
-/// bridge's second internal field. All document V8 callbacks run on the render
+/// bridge object. All document V8 callbacks run on the render
/// owner thread, so there is no data race. Callers must not hold a Rust `&mut`
/// reference across a V8 API call that could trigger re-entrant JavaScript
/// execution.
diff --git a/moli-renderer-v8/src/window_host.rs b/moli-renderer-v8/src/window_host.rs
index 3ef1b8b38..3c74805d6 100644
--- a/moli-renderer-v8/src/window_host.rs
+++ b/moli-renderer-v8/src/window_host.rs
@@ -37,7 +37,6 @@ use super::{
enter_active_child_window_scope, enter_top_level_lightweight_popup_scope,
node_runtime_and_handle_from_object, throw_dom_exception,
},
- reflector::ReflectorId,
script_provenance::CompiledStringProvenance,
util::{
callback_arg_string, context_host_from_global_bridge, context_host_ptr_from_global_bridge,
@@ -1982,6 +1981,9 @@ fn event_target_handle_from_this<'s>(
if this.strict_equals(global.into()) {
return Some(EventTargetHandle::Window);
}
+ if context_host_ptr_from_window_object(scope, this) == Some(host_ptr) {
+ return Some(EventTargetHandle::Window);
+ }
if let Some(handle) =
crate::native_bridge::document::detached_native_handle_for_runtime(scope, host_ptr, this)
@@ -1995,17 +1997,7 @@ fn event_target_handle_from_this<'s>(
return Some(EventTargetHandle::Node(handle));
}
- let handle_value = this.get_internal_field(scope, 1)?;
- let handle_value = v8::Local::<v8::Value>::try_from(handle_value).ok()?;
- let handle_number = handle_value.number_value(scope)?;
- if !handle_number.is_finite() || handle_number.fract() != 0.0 || handle_number <= 0.0 {
- return None;
- }
-
- let reflector_id = ReflectorId::from_raw(handle_number as u64);
- let handle = host.resolve_node_wrapper_handle(reflector_id)?;
- host.dom_host().node(handle)?;
- Some(EventTargetHandle::Node(handle))
+ None
}
fn child_window_handle<'s>(