Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(range): share direct and relative boundary updates

ldm03fce3908e68d
diff --git a/moli-renderer-v8/src/context_bootstrap/range.rs b/moli-renderer-v8/src/context_bootstrap/range.rs
index d17a6e9e0..01c7a7468 100644
--- a/moli-renderer-v8/src/context_bootstrap/range.rs
+++ b/moli-renderer-v8/src/context_bootstrap/range.rs
@@ -3,14 +3,12 @@ pub(super) use crate::native_bridge::RangeBoundarySide;
mod arguments;
mod exceptions;
-mod mutation;
mod object;
mod static_storage;
mod validation;
pub(super) use arguments::{callback_arg_node_object, webidl_node_arg};
pub(super) use exceptions::throw_named_dom_exception;
-pub(super) use mutation::range_set_boundary_relative;
pub(super) use object::{
RANGE_WRAPPER_INTERNAL_FIELD_COUNT, current_document_object, initialize_range_object,
native_range_boundary_handles, native_range_boundary_point, new_range_for_document,
diff --git a/moli-renderer-v8/src/context_bootstrap/range/mutation.rs b/moli-renderer-v8/src/context_bootstrap/range/mutation.rs
deleted file mode 100644
index 40d8ee1da..000000000
--- a/moli-renderer-v8/src/context_bootstrap/range/mutation.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use super::super::range_algorithms::point_order;
-use super::*;
-use crate::webidl;
-
-#[derive(webidl::WebIdlArgs)]
-#[webidl(prefix = "Range boundary method")]
-struct RangeRelativeBoundaryArgs<'s> {
- #[webidl(with = range_relative_boundary_node_arg)]
- node: v8::Local<'s, v8::Object>,
-}
-
-fn range_relative_boundary_node_arg<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- args: &v8::FunctionCallbackArguments<'s>,
- index: i32,
-) -> Result<v8::Local<'s, v8::Object>, webidl::WebIdlError> {
- webidl_node_arg(scope, args, index, "Range boundary method requires a Node")
-}
-
-pub(in crate::context_bootstrap) fn range_set_boundary_relative<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- args: v8::FunctionCallbackArguments<'s>,
- mut rv: v8::ReturnValue<'_, v8::Value>,
- is_start: bool,
- after: bool,
-) {
- let Some(parsed) = webidl::parse_args::<RangeRelativeBoundaryArgs<'s>>(scope, &args) else {
- return;
- };
- let node = parsed.node;
- // Spec setStartBefore/setStartAfter/setEndBefore/setEndAfter(node):
- // If node has no parent, throw InvalidNodeTypeError (the node is not a
- // child of any container, so before/after has no boundary point). WPT
- // tests this explicitly with detached / document-root nodes.
- let Some(parent) = object_property_as_object(scope, node, "parentNode") else {
- super::exceptions::throw_named_dom_exception(
- scope,
- "InvalidNodeTypeError",
- "Range boundary method requires a node with a parent.",
- );
- return;
- };
- let Some(index) = child_index(scope, parent, node) else {
- rv.set_undefined();
- return;
- };
- let offset = index + u32::from(after);
- if is_start {
- set_range_boundary(scope, args.this(), RangeBoundarySide::Start, parent, offset);
- let Some(end_container) =
- range_boundary_container_object(scope, args.this(), RangeBoundarySide::End)
- else {
- rv.set_undefined();
- return;
- };
- let end_offset = range_boundary_offset(scope, args.this(), RangeBoundarySide::End) as u32;
- if point_order(scope, parent, offset, end_container, end_offset)
- .is_none_or(|order| order == std::cmp::Ordering::Greater)
- {
- set_range_boundary(scope, args.this(), RangeBoundarySide::End, parent, offset);
- }
- } else {
- set_range_boundary(scope, args.this(), RangeBoundarySide::End, parent, offset);
- let Some(start_container) =
- range_boundary_container_object(scope, args.this(), RangeBoundarySide::Start)
- else {
- rv.set_undefined();
- return;
- };
- let start_offset =
- range_boundary_offset(scope, args.this(), RangeBoundarySide::Start) as u32;
- if point_order(scope, start_container, start_offset, parent, offset)
- .is_none_or(|order| order == std::cmp::Ordering::Greater)
- {
- set_range_boundary(scope, args.this(), RangeBoundarySide::Start, parent, offset);
- }
- }
- rv.set_undefined();
-}
diff --git a/moli-renderer-v8/src/context_bootstrap/range_surface.rs b/moli-renderer-v8/src/context_bootstrap/range_surface.rs
index 3c42e9fa2..ba970a389 100644
--- a/moli-renderer-v8/src/context_bootstrap/range_surface.rs
+++ b/moli-renderer-v8/src/context_bootstrap/range_surface.rs
@@ -2,8 +2,7 @@ use super::range::{
RANGE_WRAPPER_INTERNAL_FIELD_COUNT, RangeBoundarySide, child_index, current_document_object,
initialize_range_object, initialize_static_range_object, new_range_for_document,
range_boundary_container_object, range_boundary_offset, range_is_collapsed, range_node_length,
- range_set_boundary_relative, range_validate_boundary_point, set_range_boundary,
- throw_named_dom_exception, webidl_node_arg,
+ range_validate_boundary_point, set_range_boundary, throw_named_dom_exception, webidl_node_arg,
};
use super::range_algorithms::{
create_contextual_fragment_internal, native_boundary_point_from_node,
diff --git a/moli-renderer-v8/src/context_bootstrap/range_surface/boundaries.rs b/moli-renderer-v8/src/context_bootstrap/range_surface/boundaries.rs
index e33accdb4..319296b8b 100644
--- a/moli-renderer-v8/src/context_bootstrap/range_surface/boundaries.rs
+++ b/moli-renderer-v8/src/context_bootstrap/range_surface/boundaries.rs
@@ -110,33 +110,13 @@ pub(super) fn range_set_start_callback<'s>(
);
return;
}
- let selection_update = selection_range_update_state(scope, args.this());
- set_range_boundary(
+ range_set_boundary_and_sync_selection(
scope,
args.this(),
RangeBoundarySide::Start,
container,
offset,
);
- let Some(end_container) =
- range_boundary_container_object(scope, args.this(), RangeBoundarySide::End)
- else {
- rv.set_undefined();
- return;
- };
- let end_offset = range_boundary_offset(scope, args.this(), RangeBoundarySide::End) as u32;
- if point_order(scope, container, offset, end_container, end_offset)
- .is_none_or(|order| order == std::cmp::Ordering::Greater)
- {
- set_range_boundary(
- scope,
- args.this(),
- RangeBoundarySide::End,
- container,
- offset,
- );
- }
- range_sync_selection_after_set_start(scope, selection_update, args.this(), container, offset);
rv.set_undefined();
}
@@ -166,33 +146,13 @@ pub(super) fn range_set_end_callback<'s>(
);
return;
}
- let selection_update = selection_range_update_state(scope, args.this());
- set_range_boundary(
+ range_set_boundary_and_sync_selection(
scope,
args.this(),
RangeBoundarySide::End,
container,
offset,
);
- let Some(start_container) =
- range_boundary_container_object(scope, args.this(), RangeBoundarySide::Start)
- else {
- rv.set_undefined();
- return;
- };
- let start_offset = range_boundary_offset(scope, args.this(), RangeBoundarySide::Start) as u32;
- if point_order(scope, start_container, start_offset, container, offset)
- .is_none_or(|order| order == std::cmp::Ordering::Greater)
- {
- set_range_boundary(
- scope,
- args.this(),
- RangeBoundarySide::Start,
- container,
- offset,
- );
- }
- range_sync_selection_after_set_end(scope, selection_update, args.this(), container, offset);
rv.set_undefined();
}
@@ -360,6 +320,98 @@ fn node_is_doctype<'s>(scope: &mut v8::PinScope<'s, '_>, node: v8::Local<'s, v8:
.unwrap_or(false)
}
+#[derive(webidl::WebIdlArgs)]
+#[webidl(prefix = "Range boundary method")]
+struct RangeRelativeBoundaryArgs<'s> {
+ #[webidl(with = range_relative_boundary_node_arg)]
+ node: v8::Local<'s, v8::Object>,
+}
+
+fn range_relative_boundary_node_arg<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ args: &v8::FunctionCallbackArguments<'s>,
+ index: i32,
+) -> Result<v8::Local<'s, v8::Object>, webidl::WebIdlError> {
+ webidl_node_arg(scope, args, index, "Range boundary method requires a Node")
+}
+
+fn range_set_boundary_relative<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ args: v8::FunctionCallbackArguments<'s>,
+ mut rv: v8::ReturnValue<'_, v8::Value>,
+ is_start: bool,
+ after: bool,
+) {
+ let Some(parsed) = webidl::parse_args::<RangeRelativeBoundaryArgs<'s>>(scope, &args) else {
+ return;
+ };
+ let node = parsed.node;
+ // Spec setStartBefore/setStartAfter/setEndBefore/setEndAfter(node):
+ // If node has no parent, throw InvalidNodeTypeError (the node is not a
+ // child of any container, so before/after has no boundary point). WPT
+ // tests this explicitly with detached / document-root nodes.
+ let Some(parent) = object_property_as_object(scope, node, "parentNode") else {
+ throw_named_dom_exception(
+ scope,
+ "InvalidNodeTypeError",
+ "Range boundary method requires a node with a parent.",
+ );
+ return;
+ };
+ let Some(index) = child_index(scope, parent, node) else {
+ rv.set_undefined();
+ return;
+ };
+ let offset = index + u32::from(after);
+ let side = if is_start {
+ RangeBoundarySide::Start
+ } else {
+ RangeBoundarySide::End
+ };
+ range_set_boundary_and_sync_selection(scope, args.this(), side, parent, offset);
+ rv.set_undefined();
+}
+
+// Direct and relative setters use the same Range adjustment and Selection
+// notification, after their argument and boundary validation has succeeded.
+fn range_set_boundary_and_sync_selection<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ range: v8::Local<'s, v8::Object>,
+ side: RangeBoundarySide,
+ container: v8::Local<'s, v8::Object>,
+ offset: u32,
+) {
+ let selection_update = selection_range_update_state(scope, range);
+ set_range_boundary(scope, range, side, container, offset);
+ let other_side = match side {
+ RangeBoundarySide::Start => RangeBoundarySide::End,
+ RangeBoundarySide::End => RangeBoundarySide::Start,
+ };
+ let Some(other_container) = range_boundary_container_object(scope, range, other_side) else {
+ return;
+ };
+ let other_offset = range_boundary_offset(scope, range, other_side) as u32;
+ let order = match side {
+ RangeBoundarySide::Start => {
+ point_order(scope, container, offset, other_container, other_offset)
+ }
+ RangeBoundarySide::End => {
+ point_order(scope, other_container, other_offset, container, offset)
+ }
+ };
+ if order.is_none_or(|order| order == std::cmp::Ordering::Greater) {
+ set_range_boundary(scope, range, other_side, container, offset);
+ }
+ match side {
+ RangeBoundarySide::Start => {
+ range_sync_selection_after_set_start(scope, selection_update, range, container, offset)
+ }
+ RangeBoundarySide::End => {
+ range_sync_selection_after_set_end(scope, selection_update, range, container, offset)
+ }
+ }
+}
+
fn range_sync_selection_after_set_start<'s>(
scope: &mut v8::PinScope<'s, '_>,
selection_update: Option<SelectionRangeUpdateState<'s>>,
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage/event_dispatch_and_targets.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage/event_dispatch_and_targets.rs
index 4f2e27ab0..5604c1b8a 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage/event_dispatch_and_targets.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage/event_dispatch_and_targets.rs
@@ -1621,3 +1621,36 @@ fn bubble_stop_propagation_keeps_current_ancestor_listeners() {
assert_eq!(result, "handler,listener|handler|first,second");
}
+
+#[test]
+fn relative_range_boundaries_share_selection_updates() {
+ let mut vm = new_parsed_test_vm(
+ "https://shared-binding-regression.test/",
+ "<!doctype html><body></body>",
+ );
+ let result = vm
+ .eval(
+ r#"
+ (() => {
+ document.body.innerHTML = '<div><i>a</i><b>b</b><em>c</em></div>';
+ const parent = document.body.firstChild;
+ const selection = getSelection();
+ const results = [];
+ for (const method of ['setStartBefore', 'setStartAfter', 'setEndBefore', 'setEndAfter']) {
+ const range = document.createRange();
+ range.selectNodeContents(parent);
+ selection.removeAllRanges();
+ selection.addRange(range);
+ range[method](parent.children[1]);
+ results.push(selection.anchorNode === range.startContainer,
+ selection.anchorOffset === range.startOffset,
+ selection.focusNode === range.endContainer,
+ selection.focusOffset === range.endOffset);
+ }
+ return results.every(Boolean);
+ })()
+ "#,
+ )
+ .unwrap();
+ assert_eq!(result, "true");
+}