Skip to content

armgit / moli

Public Imported from GitHub
0

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

refactor(webidl): share native event dictionary ancestors

ldm091b72e91b9ba
diff --git a/moli-renderer-v8/src/context_bootstrap/events/modifiers.rs b/moli-renderer-v8/src/context_bootstrap/events/modifiers.rs
index ec5505d6c..46981df89 100644
--- a/moli-renderer-v8/src/context_bootstrap/events/modifiers.rs
+++ b/moli-renderer-v8/src/context_bootstrap/events/modifiers.rs
@@ -19,10 +19,12 @@ const MODIFIER_KEYS: [&str; 14] = [
"Shift",
];
-/// EventModifierInit members, in Web IDL dictionary order.
+/// The UIEventInit ancestor is converted before the modifier members.
#[derive(Default, webidl::WebIdlDictionary)]
#[webidl(prefix = "EventModifierInit")]
-pub(super) struct EventModifierInitMembers {
+pub(super) struct EventModifierInit<'s> {
+ #[webidl(inherit)]
+ ui: super::ui::UiEventInit<'s>,
#[webidl(default = false)]
alt_key: bool,
#[webidl(default = false)]
@@ -62,8 +64,21 @@ struct EventModifierProperties {
shift_key: bool,
}
-impl EventModifierInitMembers {
- pub(super) fn initialize<'s>(
+impl<'s> EventModifierInit<'s> {
+ pub(super) fn event_flags(&self) -> (bool, bool, bool) {
+ self.ui.event_flags()
+ }
+
+ pub(super) fn initialize(
+ &self,
+ scope: &mut v8::PinScope<'s, '_>,
+ event: v8::Local<'s, v8::Object>,
+ ) {
+ self.ui.initialize(scope, event);
+ self.initialize_modifiers(scope, event);
+ }
+
+ fn initialize_modifiers(
&self,
scope: &mut v8::PinScope<'s, '_>,
event: v8::Local<'s, v8::Object>,
@@ -111,14 +126,14 @@ pub(in crate::context_bootstrap) fn initialize_legacy_event_modifiers<'s>(
shift_key: bool,
meta_key: bool,
) {
- EventModifierInitMembers {
+ EventModifierInit {
ctrl_key,
alt_key,
shift_key,
meta_key,
..Default::default()
}
- .initialize(scope, event);
+ .initialize_modifiers(scope, event);
}
#[derive(webidl::WebIdlArgs)]
diff --git a/moli-renderer-v8/src/context_bootstrap/events/subclasses/keyboard.rs b/moli-renderer-v8/src/context_bootstrap/events/subclasses/keyboard.rs
index 04a9689d0..fb0f71968 100644
--- a/moli-renderer-v8/src/context_bootstrap/events/subclasses/keyboard.rs
+++ b/moli-renderer-v8/src/context_bootstrap/events/subclasses/keyboard.rs
@@ -1,4 +1,4 @@
-use super::super::ui::{UiEventInit, initialize_legacy_ui_event};
+use super::super::ui::initialize_legacy_ui_event;
use super::*;
use crate::webidl;
use moli_webapi_declare::WebApiObject;
@@ -40,14 +40,13 @@ impl Default for KeyboardEventInitMembers {
#[derive(Default)]
pub(super) struct KeyboardEventInit<'s> {
- ui: UiEventInit<'s>,
- modifiers: super::super::modifiers::EventModifierInitMembers,
+ modifiers: super::super::modifiers::EventModifierInit<'s>,
keyboard: KeyboardEventInitMembers,
}
impl KeyboardEventInit<'_> {
pub(super) fn event_flags(&self) -> (bool, bool, bool) {
- self.ui.event_flags()
+ self.modifiers.event_flags()
}
}
@@ -63,7 +62,6 @@ pub(super) fn parse_keyboard_event_init<'s>(
// Parse the inheritance chain base-first. Each group's members are
// read once in lexical order, before initializing any event state.
Ok(KeyboardEventInit {
- ui: webidl::parse_dictionary_object(scope, object)?,
modifiers: webidl::parse_dictionary_object(scope, object)?,
keyboard: webidl::parse_dictionary_object(scope, object)?,
})
@@ -82,7 +80,6 @@ pub(super) fn initialize_keyboard_event<'s>(
event: v8::Local<'s, v8::Object>,
parsed: KeyboardEventInit<'s>,
) {
- parsed.ui.initialize(scope, event);
parsed.modifiers.initialize(scope, event);
parsed
.keyboard
diff --git a/moli-renderer-v8/src/context_bootstrap/events/subclasses/security_policy.rs b/moli-renderer-v8/src/context_bootstrap/events/subclasses/security_policy.rs
index ffc3d3986..a304b3b5e 100644
--- a/moli-renderer-v8/src/context_bootstrap/events/subclasses/security_policy.rs
+++ b/moli-renderer-v8/src/context_bootstrap/events/subclasses/security_policy.rs
@@ -57,46 +57,15 @@ pub(super) struct SecurityPolicyViolationEventInit {
violated_directive: webidl::DomString16,
}
-impl Default for SecurityPolicyViolationEventInit {
- fn default() -> Self {
- Self {
- base: EventInit::default(),
- blocked_uri: String::new(),
- column_number: 0,
- disposition: SecurityPolicyViolationEventDisposition::Enforce,
- document_uri: String::new(),
- effective_directive: webidl::DomString16(Vec::new()),
- line_number: 0,
- original_policy: webidl::DomString16(Vec::new()),
- referrer: String::new(),
- sample: webidl::DomString16(Vec::new()),
- source_file: String::new(),
- status_code: 0,
- violated_directive: webidl::DomString16(Vec::new()),
- }
- }
-}
-
pub(super) fn parse_security_policy_violation_event_init<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: &v8::FunctionCallbackArguments<'s>,
) -> Option<SecurityPolicyViolationEventInit> {
- let parsed = webidl::dictionary_arg(
+ crate::context_bootstrap::events::parse_event_dictionary(
+ scope,
args,
- 1,
- webidl::Context::argument("SecurityPolicyViolationEvent", 2),
+ "SecurityPolicyViolationEvent",
)
- .and_then(|object| match object {
- Some(object) => webidl::parse_dictionary_object(scope, object),
- None => Ok(SecurityPolicyViolationEventInit::default()),
- });
- match parsed {
- Ok(init) => Some(init),
- Err(error) => {
- webidl::throw_error(scope, &error);
- None
- }
- }
}
impl SecurityPolicyViolationEventInit {
diff --git a/moli-renderer-v8/src/context_bootstrap/events/ui.rs b/moli-renderer-v8/src/context_bootstrap/events/ui.rs
index 77e7f1616..386350183 100644
--- a/moli-renderer-v8/src/context_bootstrap/events/ui.rs
+++ b/moli-renderer-v8/src/context_bootstrap/events/ui.rs
@@ -31,7 +31,7 @@ impl<'s> UiEventInit<'s> {
}
pub(super) fn initialize(
- self,
+ &self,
scope: &mut v8::PinScope<'s, '_>,
event: v8::Local<'s, v8::Object>,
) {
diff --git a/moli-renderer-v8/src/context_bootstrap/events/value.rs b/moli-renderer-v8/src/context_bootstrap/events/value.rs
index 47703880a..7fae195ea 100644
--- a/moli-renderer-v8/src/context_bootstrap/events/value.rs
+++ b/moli-renderer-v8/src/context_bootstrap/events/value.rs
@@ -179,12 +179,8 @@ struct GamepadEventPrototypeDeclaration {
#[derive(webidl::WebIdlDictionary)]
#[webidl(prefix = "GamepadEventInit", snapshot)]
struct GamepadEventInit<'s> {
- #[webidl(default = false)]
- bubbles: bool,
- #[webidl(default = false)]
- cancelable: bool,
- #[webidl(default = false)]
- composed: bool,
+ #[webidl(inherit)]
+ base: EventInit,
#[webidl(with = gamepad_member)]
#[webidl(snapshot_slot = GAMEPAD_SLOT, snapshot_default = v8::null(scope).into())]
gamepad: Option<v8::Local<'s, v8::Object>>,
@@ -512,7 +508,11 @@ fn value_event_constructor<'s>(
parsed
.initialize_snapshot(scope, state)
.expect("value event state");
- (parsed.bubbles, parsed.cancelable, parsed.composed)
+ (
+ parsed.base.bubbles,
+ parsed.base.cancelable,
+ parsed.base.composed,
+ )
}
};
initialize_event_object_with_type(scope, state, event_type, bubbles, cancelable);