Skip to content

armgit / moli

Public Imported from GitHub
0

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

refactor(events): derive legacy MouseEvent interface conversions

ldm0bfb457b28027
diff --git a/moli-renderer-v8/src/context_bootstrap/event_legacy.rs b/moli-renderer-v8/src/context_bootstrap/event_legacy.rs
index c7a32bda4..5ed7e9039 100644
--- a/moli-renderer-v8/src/context_bootstrap/event_legacy.rs
+++ b/moli-renderer-v8/src/context_bootstrap/event_legacy.rs
@@ -1,4 +1,4 @@
-use super::events::{EventTargetReference, WindowReference, reinitialize_event_object};
+use super::events::reinitialize_event_object;
use super::*;
use crate::util::{context_host_ptr_from_window_object, throw_type_error};
use crate::webidl;
@@ -93,8 +93,13 @@ struct InitMouseEventArgs<'s> {
bubbles: bool,
#[webidl(default = false)]
cancelable: bool,
- #[webidl(index = 3, nullable, converter = "raw")]
- view: Option<WindowReference<'s>>,
+ #[webidl(
+ index = 3,
+ nullable,
+ interface = crate::web_api_interfaces::Window,
+ brand_check = is_window_receiver
+ )]
+ view: Option<v8::Local<'s, v8::Object>>,
#[webidl(default = 0, index = 4)]
detail: i32,
#[webidl(default = 0, index = 5)]
@@ -115,8 +120,8 @@ struct InitMouseEventArgs<'s> {
meta_key: bool,
#[webidl(default = 0, index = 13)]
button: i16,
- #[webidl(index = 14, nullable, converter = "raw")]
- related_target: Option<EventTargetReference<'s>>,
+ #[webidl(index = 14, nullable, interface = crate::web_api_interfaces::EventTarget)]
+ related_target: Option<v8::Local<'s, v8::Object>>,
}
#[derive(webidl::WebIdlArgs)]
@@ -378,11 +383,11 @@ pub(super) fn mouse_event_init_callback<'s>(
};
let view = parsed
.view
- .map(WindowReference::into_value)
+ .map(Into::into)
.unwrap_or_else(|| v8::null(scope).into());
let related_target = parsed
.related_target
- .map(EventTargetReference::into_value)
+ .map(Into::into)
.unwrap_or_else(|| v8::null(scope).into());
if !reinitialize_event_object(
scope,
diff --git a/moli-renderer-v8/src/context_bootstrap/events.rs b/moli-renderer-v8/src/context_bootstrap/events.rs
index 230047aec..fb70a84bb 100644
--- a/moli-renderer-v8/src/context_bootstrap/events.rs
+++ b/moli-renderer-v8/src/context_bootstrap/events.rs
@@ -7,14 +7,12 @@ mod device;
mod init;
mod kind;
mod methods;
-mod references;
mod subclasses;
mod submit;
mod value;
mod wrappers;
pub(in crate::context_bootstrap) mod audio;
-pub(in crate::context_bootstrap) use references::{EventTargetReference, WindowReference};
pub(in crate::context_bootstrap) use device::{
device_motion_event_constructor, device_orientation_event_constructor,
diff --git a/moli-renderer-v8/src/context_bootstrap/events/references.rs b/moli-renderer-v8/src/context_bootstrap/events/references.rs
deleted file mode 100644
index 38b5f2f92..000000000
--- a/moli-renderer-v8/src/context_bootstrap/events/references.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use crate::context_bootstrap::is_window_receiver;
-use crate::web_api_interfaces;
-use crate::webidl;
-
-/// Window-valued event arguments and dictionary members share native identity.
-pub(in crate::context_bootstrap) struct WindowReference<'s>(v8::Local<'s, v8::Object>);
-
-impl<'s> WindowReference<'s> {
- pub(in crate::context_bootstrap) fn into_value(self) -> v8::Local<'s, v8::Value> {
- self.0.into()
- }
-}
-
-impl<'s> webidl::WebIdlConverter<'s> for WindowReference<'s> {
- type Options = ();
-
- fn convert(
- scope: &mut v8::PinScope<'s, '_>,
- value: v8::Local<'s, v8::Value>,
- context: webidl::Context,
- _options: &Self::Options,
- ) -> Result<Self, webidl::WebIdlError> {
- if let Ok(window) = v8::Local::<v8::Object>::try_from(value)
- && is_window_receiver(scope, window)
- {
- return Ok(Self(window));
- }
- Err(webidl::WebIdlError::cannot_convert(context, "Window"))
- }
-}
-
-/// EventTarget conversion honors the brand layer's registered native proxies.
-pub(in crate::context_bootstrap) struct EventTargetReference<'s>(v8::Local<'s, v8::Object>);
-
-impl<'s> EventTargetReference<'s> {
- pub(in crate::context_bootstrap) fn into_value(self) -> v8::Local<'s, v8::Value> {
- self.0.into()
- }
-}
-
-impl<'s> webidl::WebIdlConverter<'s> for EventTargetReference<'s> {
- type Options = ();
-
- fn convert(
- scope: &mut v8::PinScope<'s, '_>,
- value: v8::Local<'s, v8::Value>,
- context: webidl::Context,
- _options: &Self::Options,
- ) -> Result<Self, webidl::WebIdlError> {
- let target = webidl::convert::<v8::Local<'s, v8::Object>>(scope, value, context)?;
- if !web_api_interfaces::EventTarget::is_instance(scope, target) {
- return Err(webidl::WebIdlError::cannot_convert(context, "EventTarget"));
- }
- Ok(Self(target))
- }
-}