Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(scroll): remove automatic DOM mutation anchoring

ldm04617ec9a622e
diff --git a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/insertion.rs b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/insertion.rs
index b3ba74d64..d9264425a 100644
--- a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/insertion.rs
+++ b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/insertion.rs
@@ -88,17 +88,6 @@ impl DocumentRuntime {
let fragment_us = fragment_started
.map(|started| started.elapsed().as_micros())
.unwrap_or_default();
- let scroll_started = cpu_profile_enabled.then(std::time::Instant::now);
- let scroll_anchor_adjustment = self
- .window_scroll_anchor_adjustment_for_connected_roots_moved_to_disconnected_parent(
- scope,
- host_ptr,
- parent,
- insertion_roots,
- );
- let scroll_us = scroll_started
- .map(|started| started.elapsed().as_micros())
- .unwrap_or_default();
let plan_started = cpu_profile_enabled.then(std::time::Instant::now);
let insertion_plan = self.tree_insertion_plan(
parent,
@@ -107,7 +96,6 @@ impl DocumentRuntime {
TreeInsertionPlanOptions::insert(
None,
fragment_children.is_some() && !self.dom_host.is_shadow_root(child),
- scroll_anchor_adjustment,
TreeInsertionSelectednessPolicy::CaptureAndRestore,
),
);
@@ -199,7 +187,6 @@ impl DocumentRuntime {
subtree_node_count,
parent_connected = self.dom_host.is_connected(parent),
fragment_us,
- scroll_us,
plan_us,
focus_us,
effects_us,
@@ -360,13 +347,6 @@ impl DocumentRuntime {
Some(handles) => handles,
None => std::slice::from_ref(&child),
};
- let scroll_anchor_adjustment = self
- .window_scroll_anchor_adjustment_for_connected_roots_moved_to_disconnected_parent(
- scope,
- host_ptr,
- parent,
- insertion_roots,
- );
let insertion_plan = self.tree_insertion_plan(
parent,
insertion_roots,
@@ -374,7 +354,6 @@ impl DocumentRuntime {
TreeInsertionPlanOptions::insert(
reference_child,
fragment_children.is_some() && !self.dom_host.is_shadow_root(child),
- scroll_anchor_adjustment,
TreeInsertionSelectednessPolicy::CaptureAndRestore,
),
);
diff --git a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/insertion_followups.rs b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/insertion_followups.rs
index 41916a2b7..91e0fa6fb 100644
--- a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/insertion_followups.rs
+++ b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/insertion_followups.rs
@@ -58,9 +58,6 @@ impl DocumentRuntime {
insertion_plan: &TreeInsertionPlan<'_>,
) {
self.reset_non_dirty_textarea_selection_after_child_list_change(insertion_plan.parent);
- if let Some((x, y)) = insertion_plan.scroll_anchor_adjustment {
- crate::window_host::scroll_window_to(scope, host_ptr, x, y);
- }
if let Some(live_range_plan) = insertion_plan.live_range_plan.as_ref() {
self.apply_live_range_pre_insert_plan(scope, host_ptr, live_range_plan);
apply_live_ranges_child_insertion(
diff --git a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/insertion_plan.rs b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/insertion_plan.rs
index 2389c4dc2..78a151830 100644
--- a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/insertion_plan.rs
+++ b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/insertion_plan.rs
@@ -16,7 +16,6 @@ pub(super) struct TreeInsertionPlan<'a> {
pub(super) lifecycle_connected_roots_before_insert: Vec<DomHandle>,
pub(super) adoption: TreeAdoptionPlan,
pub(super) focus_reset_handle_before_insert: Option<DomHandle>,
- pub(super) scroll_anchor_adjustment: Option<(f64, f64)>,
pub(super) live_range_plan: Option<LiveRangePreInsertPlan>,
pub(super) node_iterator_plan: Vec<NodeIteratorRemovalPlan>,
pub(super) subtree_plan: InsertionSubtreePlan,
@@ -40,7 +39,6 @@ pub(super) enum TreeInsertionSelectednessPolicy {
pub(super) struct TreeInsertionPlanOptions {
live_range_mode: TreeInsertionLiveRangeMode,
inserting_fragment_children: bool,
- scroll_anchor_adjustment: Option<(f64, f64)>,
selectedness_policy: TreeInsertionSelectednessPolicy,
}
@@ -69,13 +67,11 @@ impl TreeInsertionPlanOptions {
pub(super) fn insert(
reference_child: Option<DomHandle>,
inserting_fragment_children: bool,
- scroll_anchor_adjustment: Option<(f64, f64)>,
selectedness_policy: TreeInsertionSelectednessPolicy,
) -> Self {
Self {
live_range_mode: TreeInsertionLiveRangeMode::Insert { reference_child },
inserting_fragment_children,
- scroll_anchor_adjustment,
selectedness_policy,
}
}
@@ -84,7 +80,6 @@ impl TreeInsertionPlanOptions {
Self {
live_range_mode: TreeInsertionLiveRangeMode::Replace { old_child },
inserting_fragment_children,
- scroll_anchor_adjustment: None,
selectedness_policy: TreeInsertionSelectednessPolicy::CaptureAndRestore,
}
}
@@ -147,7 +142,6 @@ impl DocumentRuntime {
lifecycle_connected_roots_before_insert,
adoption,
focus_reset_handle_before_insert,
- scroll_anchor_adjustment: options.scroll_anchor_adjustment,
live_range_plan,
node_iterator_plan,
subtree_plan,
diff --git a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/parser.rs b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/parser.rs
index 00105ae72..08240ae04 100644
--- a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/parser.rs
+++ b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/parser.rs
@@ -54,13 +54,6 @@ impl DocumentRuntime {
Some(handles) => handles,
None => std::slice::from_ref(&child),
};
- let scroll_anchor_adjustment = self
- .window_scroll_anchor_adjustment_for_connected_roots_moved_to_disconnected_parent(
- scope,
- host_ptr,
- parent,
- insertion_roots,
- );
let insertion_plan = self.tree_insertion_plan(
parent,
insertion_roots,
@@ -68,7 +61,6 @@ impl DocumentRuntime {
TreeInsertionPlanOptions::insert(
None,
fragment_children.is_some() && !self.dom_host.is_shadow_root(child),
- scroll_anchor_adjustment,
TreeInsertionSelectednessPolicy::Skip,
),
);
@@ -96,13 +88,6 @@ impl DocumentRuntime {
Some(handles) => handles,
None => std::slice::from_ref(&child),
};
- let scroll_anchor_adjustment = self
- .window_scroll_anchor_adjustment_for_connected_roots_moved_to_disconnected_parent(
- scope,
- host_ptr,
- parent,
- insertion_roots,
- );
let insertion_plan = self.tree_insertion_plan(
parent,
insertion_roots,
@@ -110,7 +95,6 @@ impl DocumentRuntime {
TreeInsertionPlanOptions::insert(
reference_child,
fragment_children.is_some() && !self.dom_host.is_shadow_root(child),
- scroll_anchor_adjustment,
TreeInsertionSelectednessPolicy::Skip,
),
);
@@ -308,7 +292,7 @@ impl DocumentRuntime {
parent: DomHandle,
child: DomHandle,
) {
- let removal_plan = self.tree_removal_plan(scope, host_ptr, parent, child);
+ let removal_plan = self.tree_removal_plan(host_ptr, parent, child);
let effects = self.parser_remove_child_effects_in_structural_scope(parent, child);
self.apply_tree_removal_node_iterator_plan_if_changed(host_ptr, &removal_plan, &effects);
self.assert_active_parser_document_incarnation();
diff --git a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/removal.rs b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/removal.rs
index 5f4f5c678..319371bb0 100644
--- a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/removal.rs
+++ b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/removal.rs
@@ -14,7 +14,6 @@ pub(super) struct TreeRemovalPlan {
pub(super) lifecycle_connected_roots_before_remove: Vec<DomHandle>,
pub(super) focus_reset_handle_before_remove: Option<DomHandle>,
pub(super) focus_within_handles_before_remove: Vec<DomHandle>,
- pub(super) scroll_anchor_adjustment: Option<(f64, f64)>,
pub(super) live_range_removal_index: Option<u32>,
pub(super) live_range_previous_sibling: Option<DomHandle>,
pub(super) node_iterator_plan: Option<NodeIteratorRemovalPlan>,
@@ -24,7 +23,6 @@ pub(super) struct TreeRemovalPlan {
impl DocumentRuntime {
pub(super) fn tree_removal_plan(
&self,
- scope: &mut v8::PinScope<'_, '_>,
host_ptr: *mut JsContextHost,
parent: DomHandle,
root: DomHandle,
@@ -40,8 +38,6 @@ impl DocumentRuntime {
let focus_within_handles_before_remove = focus_reset_handle_before_remove
.map(|active| self.focus_within_handles_for_active_element_before_tree_change(active))
.unwrap_or_default();
- let scroll_anchor_adjustment =
- self.window_scroll_anchor_adjustment_for_removal(scope, host_ptr, root);
let live_range_removal_index = if unsafe { &mut *host_ptr }.live_ranges_is_empty() {
None
} else {
@@ -64,7 +60,6 @@ impl DocumentRuntime {
lifecycle_connected_roots_before_remove,
focus_reset_handle_before_remove,
focus_within_handles_before_remove,
- scroll_anchor_adjustment,
live_range_removal_index,
live_range_previous_sibling,
node_iterator_plan,
@@ -139,7 +134,7 @@ impl DocumentRuntime {
let mut combined_effects = DomMutationEffects::default();
let mut prepublished_removals = Vec::new();
for &child in &removed_children {
- let removal_plan = self.tree_removal_plan(scope, host_ptr, parent, child);
+ let removal_plan = self.tree_removal_plan(host_ptr, parent, child);
prepublished_removals
.extend(self.break_on_dom_debugger_before_tree_removal(host_ptr, parent, child));
let effects = self.remove_child_effects_in_structural_scope(parent, child);
@@ -184,7 +179,7 @@ impl DocumentRuntime {
source_profile: TreeMutationSourceProfile,
) -> bool {
let started = dom_binding_timing_started();
- let removal_plan = self.tree_removal_plan(scope, host_ptr, parent, child);
+ let removal_plan = self.tree_removal_plan(host_ptr, parent, child);
let prepublished_removals =
self.break_on_dom_debugger_before_tree_removal(host_ptr, parent, child);
let effects = self.remove_child_effects_in_structural_scope(parent, child);
@@ -207,129 +202,4 @@ impl DocumentRuntime {
record_dom_binding_timing("dom.removeChild", started);
changed
}
-
- fn window_scroll_anchor_adjustment_for_removal(
- &self,
- scope: &mut v8::PinScope<'_, '_>,
- host_ptr: *mut JsContextHost,
- child: DomHandle,
- ) -> Option<(f64, f64)> {
- if !self.dom_host.is_connected(child)
- || !self
- .dom_host
- .node(child)
- .is_some_and(|node| node.is_element())
- {
- return None;
- }
- let (scroll_x, scroll_y) = crate::window_host::current_window_scroll_position(scope);
- if !scroll_x.is_finite() || !scroll_y.is_finite() {
- return None;
- }
- // Scroll anchoring only computes a vertical adjustment from the removed
- // element's block-axis rect. `scroll_x` is passed through only when such
- // an adjustment is made, so a horizontally scrolled page at `scrollY == 0`
- // has no anchoring work to perform here. Keep this before overflow-anchor
- // style lookup and geometry: repeated connected removals can
- // otherwise amplify those compatibility reads into DCL-critical work.
- if scroll_y <= 0.0 {
- return None;
- }
- let runtime = unsafe { &*host_ptr };
- if self.removal_subtree_excludes_scroll_anchoring(runtime, child) {
- return None;
- }
- let rect = match crate::native_bridge::element::observable_scroll_adjusted_client_rect(
- runtime, child, scroll_x, scroll_y,
- ) {
- Ok(rect) => rect,
- Err(error) => {
- tracing::warn!(%error, "skipping scroll anchoring after layout failure");
- return None;
- }
- };
- if rect.height <= 0.0 {
- return None;
- }
- if rect.top >= 0.0 {
- return None;
- }
- let delta = rect.height.min(-rect.top);
- (delta > 0.0).then_some((scroll_x, scroll_y - delta))
- }
-
- pub(super) fn window_scroll_anchor_adjustment_for_connected_roots_moved_to_disconnected_parent(
- &self,
- scope: &mut v8::PinScope<'_, '_>,
- host_ptr: *mut JsContextHost,
- parent: DomHandle,
- roots: &[DomHandle],
- ) -> Option<(f64, f64)> {
- if self.dom_host.is_connected(parent) {
- return None;
- }
- let (scroll_x, mut scroll_y) = crate::window_host::current_window_scroll_position(scope);
- if !scroll_x.is_finite() || !scroll_y.is_finite() || scroll_y <= 0.0 {
- return None;
- }
- let runtime = unsafe { &*host_ptr };
- let mut adjusted = false;
- for &root in roots {
- if !self.dom_host.is_connected(root)
- || !self
- .dom_host
- .node(root)
- .is_some_and(|node| node.is_element())
- || self.removal_subtree_excludes_scroll_anchoring(runtime, root)
- {
- continue;
- }
- let rect = match crate::native_bridge::element::observable_scroll_adjusted_client_rect(
- runtime, root, scroll_x, scroll_y,
- ) {
- Ok(rect) => rect,
- Err(error) => {
- tracing::warn!(%error, "skipping one moved scroll anchor after layout failure");
- continue;
- }
- };
- if rect.height <= 0.0 || rect.top >= 0.0 {
- continue;
- }
- let delta = rect.height.min(-rect.top);
- if delta > 0.0 {
- scroll_y -= delta;
- adjusted = true;
- if scroll_y <= 0.0 {
- break;
- }
- }
- }
- adjusted.then_some((scroll_x, scroll_y))
- }
-
- fn removal_subtree_excludes_scroll_anchoring(
- &self,
- runtime: &JsContextHost,
- child: DomHandle,
- ) -> bool {
- let mut current = Some(child);
- while let Some(handle) = current {
- if self
- .dom_host
- .node(handle)
- .is_some_and(|node| node.is_element())
- && crate::native_bridge::element::style_property_value(
- runtime,
- handle,
- crate::native_bridge::element::StyleMode::Computed,
- "overflow-anchor",
- ) == "none"
- {
- return true;
- }
- current = self.dom_host.node(handle).and_then(Node::parent_node);
- }
- false
- }
}
diff --git a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/removal_followups.rs b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/removal_followups.rs
index b2017f657..55565e1cc 100644
--- a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/removal_followups.rs
+++ b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/removal_followups.rs
@@ -49,9 +49,6 @@ impl DocumentRuntime {
removal_plan: &TreeRemovalPlan,
) {
self.reset_non_dirty_textarea_selection_after_child_list_change(removal_plan.parent);
- if let Some((x, y)) = removal_plan.scroll_anchor_adjustment {
- crate::window_host::scroll_window_to(scope, host_ptr, x, y);
- }
if let Some(removal_index) = removal_plan.live_range_removal_index {
context_bootstrap::live_ranges_child_removal(
scope,
diff --git a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/replacement.rs b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/replacement.rs
index ac5c83353..68e89ca31 100644
--- a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/replacement.rs
+++ b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/replacement.rs
@@ -100,7 +100,7 @@ impl DocumentRuntime {
insertion_plan.insertion_roots,
inserted_was_connected,
);
- let removal_plan = self.tree_removal_plan(scope, host_ptr, parent, old_child);
+ let removal_plan = self.tree_removal_plan(host_ptr, parent, old_child);
let (inserted, removed, prepublished_removals) = if unsafe { &*host_ptr }
.has_dom_debugger_dom_breakpoints()
{
diff --git a/moli-renderer-v8/src/native_bridge/element.rs b/moli-renderer-v8/src/native_bridge/element.rs
index be45ce4e8..6b2e4f05a 100644
--- a/moli-renderer-v8/src/native_bridge/element.rs
+++ b/moli-renderer-v8/src/native_bridge/element.rs
@@ -396,10 +396,10 @@ pub(crate) use geometry::{
InputSurfaceHit, apply_scroll_observable_effects, input_surface_hit_test,
observable_caret_position, observable_deep_hit_test, observable_event_offset,
observable_geometry_batch, observable_hit_test, observable_hit_test_all,
- observable_input_hit_test, observable_scroll_adjusted_client_rect,
- observable_sources_with_fragments, perform_scrollbar_scroll_default_action,
- perform_wheel_scroll_default_action, queue_scroll_observable_effects,
- scroll_node_into_view_at_center, scroll_node_into_view_at_start,
+ observable_input_hit_test, observable_sources_with_fragments,
+ perform_scrollbar_scroll_default_action, perform_wheel_scroll_default_action,
+ queue_scroll_observable_effects, scroll_node_into_view_at_center,
+ scroll_node_into_view_at_start,
};
pub(super) use geometry::{
node_client_height_getter_function, node_client_left_getter_function,
diff --git a/moli-renderer-v8/src/native_bridge/element/geometry.rs b/moli-renderer-v8/src/native_bridge/element/geometry.rs
index 4fc3a8cf7..60379dc0c 100644
--- a/moli-renderer-v8/src/native_bridge/element/geometry.rs
+++ b/moli-renderer-v8/src/native_bridge/element/geometry.rs
@@ -31,9 +31,9 @@ pub(crate) use mock::{
};
pub(crate) use provider::{
observable_bounding_client_rects, observable_caret_position, observable_event_offset,
- observable_geometry_batch, observable_hit_test_all, observable_scroll_adjusted_client_rect,
- observable_sources_with_fragments, observable_used_grid_tracks, read_bounding_client_rect,
- read_client_rects, read_element_metrics,
+ observable_geometry_batch, observable_hit_test_all, observable_sources_with_fragments,
+ observable_used_grid_tracks, read_bounding_client_rect, read_client_rects,
+ read_element_metrics,
};
pub(in crate::native_bridge) use rects::{
node_get_bounding_client_rect_callback, node_get_client_rects_callback,
diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/mock/layout.rs b/moli-renderer-v8/src/native_bridge/element/geometry/mock/layout.rs
index bf2f97673..8b7f70f3e 100644
--- a/moli-renderer-v8/src/native_bridge/element/geometry/mock/layout.rs
+++ b/moli-renderer-v8/src/native_bridge/element/geometry/mock/layout.rs
@@ -451,20 +451,6 @@ fn mock_offset_parent(runtime: &JsContextHost, handle: DomHandle) -> Option<DomH
None
}
-pub(crate) fn compute_mock_scroll_adjusted_client_rect(
- runtime: &JsContextHost,
- handle: DomHandle,
- scroll_x: f64,
- scroll_y: f64,
-) -> ClientRect {
- let mut rect = runtime.cached_mock_client_rect(handle, mock_client_rect);
- rect.left -= scroll_x;
- rect.right -= scroll_x;
- rect.top -= scroll_y;
- rect.bottom -= scroll_y;
- rect
-}
-
pub(crate) fn compute_mock_client_rect(runtime: &JsContextHost, handle: DomHandle) -> ClientRect {
let trace_started = moli_trace::cdp_nav_timing_enabled().then(Instant::now);
let rect = runtime.cached_mock_client_rect(handle, mock_client_rect);
diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/mock/mod.rs b/moli-renderer-v8/src/native_bridge/element/geometry/mock/mod.rs
index 7cd054d00..42216997f 100644
--- a/moli-renderer-v8/src/native_bridge/element/geometry/mock/mod.rs
+++ b/moli-renderer-v8/src/native_bridge/element/geometry/mock/mod.rs
@@ -3,6 +3,6 @@ mod queries;
pub(crate) use layout::{
compute_mock_client_rect, compute_mock_intersection_client_rect,
- compute_mock_intersection_scrollport_client_rect, compute_mock_scroll_adjusted_client_rect,
+ compute_mock_intersection_scrollport_client_rect,
};
pub(super) use queries::answer_queries;
diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/provider.rs b/moli-renderer-v8/src/native_bridge/element/geometry/provider.rs
index d153872be..e1f5f8e80 100644
--- a/moli-renderer-v8/src/native_bridge/element/geometry/provider.rs
+++ b/moli-renderer-v8/src/native_bridge/element/geometry/provider.rs
@@ -7,9 +7,7 @@ use moli_layout::{
};
use super::client_rect::{ClientRect, client_rect_from_quad, union_client_rect, zero_client_rect};
-use super::mock::{
- answer_queries as answer_mock_queries, compute_mock_scroll_adjusted_client_rect,
-};
+use super::mock::answer_queries as answer_mock_queries;
use crate::{document_runtime::DomHandle, native_bridge::JsContextHost};
fn query_source(
@@ -175,24 +173,6 @@ pub(crate) fn read_box_model(
}
}
-/// Resolve one viewport-relative box for scroll anchoring. Real layout already
-/// projects root scrolling into viewport coordinates; the explicit adjustment
-/// is retained only inside the legacy Mock provider.
-pub(crate) fn observable_scroll_adjusted_client_rect(
- runtime: &JsContextHost,
- source: DomHandle,
- scroll_x: f64,
- scroll_y: f64,
-) -> Result<ClientRect, LayoutError> {
- if runtime.layout_policy().uses_real_layout() {
- read_bounding_client_rect(runtime, source)
- } else {
- Ok(compute_mock_scroll_adjusted_client_rect(
- runtime, source, scroll_x, scroll_y,
- ))
- }
-}
-
pub(crate) fn observable_event_offset(
runtime: &JsContextHost,
source: DomHandle,
diff --git a/moli-renderer-v8/src/runtime/phase_one/mod.rs b/moli-renderer-v8/src/runtime/phase_one/mod.rs
index 25a3fe67f..f6d5f880d 100644
--- a/moli-renderer-v8/src/runtime/phase_one/mod.rs
+++ b/moli-renderer-v8/src/runtime/phase_one/mod.rs
@@ -10330,7 +10330,7 @@ window.parserPendingPointerCaptureReparent =
}
#[test]
- fn parser_remove_applies_scroll_anchor_adjustment_like_js_remove() {
+ fn parser_remove_preserves_scroll_like_js_remove() {
let runtime = tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()
@@ -10344,61 +10344,61 @@ window.parserPendingPointerCaptureReparent =
.evaluate_expression(
r#"
const jsTarget = document.createElement('div');
-jsTarget.id = 'js-scroll-anchor-remove';
+jsTarget.id = 'js-scroll-preservation-remove';
jsTarget.style.height = '20px';
const parserTarget = document.createElement('div');
-parserTarget.id = 'parser-scroll-anchor-remove';
+parserTarget.id = 'parser-scroll-preservation-remove';
parserTarget.style.height = '20px';
document.body.style.minHeight = '2000px';
document.body.append(jsTarget, parserTarget);
window.scrollTo(0, 30);
document.body.removeChild(jsTarget);
-window.parserScrollAnchorJsOffset = window.pageYOffset;
+window.parserScrollJsOffset = window.pageYOffset;
window.scrollTo(0, 30);
-window.parserScrollAnchorTarget = parserTarget;
+window.parserScrollTarget = parserTarget;
"#,
)
- .expect("scroll-anchor remove setup should evaluate");
+ .expect("scroll-preservation remove setup should evaluate");
let parser_target = page_vm
.vm()
.document_runtime
- .get_element_by_id("parser-scroll-anchor-remove")
- .expect("parser scroll-anchor target should exist");
+ .get_element_by_id("parser-scroll-preservation-remove")
+ .expect("parser scroll-preservation target should exist");
let custom_element_reaction_roots = apply_parser_dom_mutation_for_test(
&mut page_vm,
ParserDomMutation::RemoveChild {
parent: body,
child: parser_target,
},
- "parser scroll-anchor remove mutation should apply",
+ "parser scroll-preservation remove mutation should apply",
);
if !custom_element_reaction_roots.is_empty() {
page_vm
.vm_mut()
.queue_and_run_pending_parser_post_step_runtime_work_in_default_context_for_test(custom_element_reaction_roots)
- .expect("parser scroll-anchor remove reactions should dispatch");
+ .expect("parser scroll-preservation remove reactions should dispatch");
}
let result = page_vm
.evaluate_expression(
r#"JSON.stringify({
- jsOffset: window.parserScrollAnchorJsOffset,
+ jsOffset: window.parserScrollJsOffset,
parserOffset: window.pageYOffset,
- parserParent: window.parserScrollAnchorTarget.parentNode
+ parserParent: window.parserScrollTarget.parentNode
})"#,
)
- .expect("scroll-anchor remove result should evaluate");
+ .expect("scroll-preservation remove result should evaluate");
assert_eq!(
result.get("value").and_then(serde_json::Value::as_str),
- Some(r#"{"jsOffset":10,"parserOffset":10,"parserParent":null}"#),
- "parser RemoveChild should apply the same scroll-anchor adjustment as JS removeChild"
+ Some(r#"{"jsOffset":30,"parserOffset":30,"parserParent":null}"#),
+ "parser RemoveChild should preserve the scroll offset like JS removeChild"
);
}));
}
#[test]
- fn parser_reparent_applies_scroll_anchor_adjustment_like_js_reparent_to_disconnected_parent() {
+ fn parser_reparent_preserves_scroll_like_js_reparent_to_disconnected_parent() {
let runtime = tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()
@@ -10412,31 +10412,31 @@ window.parserScrollAnchorTarget = parserTarget;
.evaluate_expression(
r#"
const jsTarget = document.createElement('div');
-jsTarget.id = 'js-scroll-anchor-reparent';
+jsTarget.id = 'js-scroll-preservation-reparent';
jsTarget.style.height = '20px';
const jsDetachedParent = document.createElement('div');
const parserTarget = document.createElement('div');
-parserTarget.id = 'parser-scroll-anchor-reparent';
+parserTarget.id = 'parser-scroll-preservation-reparent';
parserTarget.style.height = '20px';
document.body.style.minHeight = '2000px';
document.body.append(jsTarget, parserTarget);
window.scrollTo(0, 30);
jsDetachedParent.appendChild(jsTarget);
-window.parserScrollAnchorReparentJsState = {
+window.parserScrollReparentJsState = {
offset: window.pageYOffset,
parentIsDetached: jsTarget.parentNode === jsDetachedParent
};
window.scrollTo(0, 30);
-window.parserScrollAnchorReparentTarget = parserTarget;
+window.parserScrollReparentTarget = parserTarget;
"#,
)
- .expect("scroll-anchor reparent setup should evaluate");
+ .expect("scroll-preservation reparent setup should evaluate");
let parser_target = page_vm
.vm()
.document_runtime
- .get_element_by_id("parser-scroll-anchor-reparent")
- .expect("parser scroll-anchor reparent target should exist");
+ .get_element_by_id("parser-scroll-preservation-reparent")
+ .expect("parser scroll-preservation reparent target should exist");
let parser_detached_parent = {
let dom_host = page_vm.vm_mut().document_runtime.dom_host_mut();
dom_host.create_parser_element_without_attributes(
@@ -10451,23 +10451,23 @@ window.parserScrollAnchorReparentTarget = parserTarget;
parent: parser_detached_parent,
child: parser_target,
},
- "parser scroll-anchor reparent mutation should apply",
+ "parser scroll-preservation reparent mutation should apply",
);
if !custom_element_reaction_roots.is_empty() {
page_vm
.vm_mut()
.queue_and_run_pending_parser_post_step_runtime_work_in_default_context_for_test(custom_element_reaction_roots)
- .expect("parser scroll-anchor reparent reactions should dispatch");
+ .expect("parser scroll-preservation reparent reactions should dispatch");
}
let result = page_vm
.evaluate_expression(
r#"JSON.stringify({
- js: window.parserScrollAnchorReparentJsState,
+ js: window.parserScrollReparentJsState,
parserOffset: window.pageYOffset
})"#,
)
- .expect("scroll-anchor reparent result should evaluate");
+ .expect("scroll-preservation reparent result should evaluate");
assert_eq!(
page_vm
.vm()
@@ -10476,18 +10476,18 @@ window.parserScrollAnchorReparentTarget = parserTarget;
.node(parser_target)
.and_then(Node::parent_node),
Some(parser_detached_parent),
- "parser reparent should move the scroll-anchor target under the native detached parent"
+ "parser reparent should move the scroll-preservation target under the native detached parent"
);
assert_eq!(
result.get("value").and_then(serde_json::Value::as_str),
- Some(r#"{"js":{"offset":10,"parentIsDetached":true},"parserOffset":10}"#),
- "parser reparent to a disconnected parent should apply the same scroll-anchor adjustment as JS reparent"
+ Some(r#"{"js":{"offset":30,"parentIsDetached":true},"parserOffset":30}"#),
+ "parser reparent to a disconnected parent should preserve the scroll offset like JS reparent"
);
}));
}
#[test]
- fn parser_insert_before_reparent_applies_scroll_anchor_adjustment_like_js() {
+ fn parser_insert_before_reparent_preserves_scroll_like_js() {
let runtime = tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()
@@ -10501,19 +10501,19 @@ window.parserScrollAnchorReparentTarget = parserTarget;
.evaluate_expression(
r#"
const jsTarget = document.createElement('div');
-jsTarget.id = 'js-scroll-anchor-insert-before';
+jsTarget.id = 'js-scroll-preservation-insert-before';
jsTarget.style.height = '20px';
const jsDetachedParent = document.createElement('div');
const jsReference = document.createElement('span');
jsDetachedParent.appendChild(jsReference);
const parserTarget = document.createElement('div');
-parserTarget.id = 'parser-scroll-anchor-insert-before';
+parserTarget.id = 'parser-scroll-preservation-insert-before';
parserTarget.style.height = '20px';
document.body.style.minHeight = '2000px';
document.body.append(jsTarget, parserTarget);
window.scrollTo(0, 30);
jsDetachedParent.insertBefore(jsTarget, jsReference);
-window.parserScrollAnchorInsertBeforeJsState = {
+window.parserScrollInsertBeforeJsState = {
offset: window.pageYOffset,
parentIsDetached: jsTarget.parentNode === jsDetachedParent,
nextIsReference: jsTarget.nextSibling === jsReference
@@ -10521,13 +10521,13 @@ window.parserScrollAnchorInsertBeforeJsState = {
window.scrollTo(0, 30);
"#,
)
- .expect("scroll-anchor insertBefore setup should evaluate");
+ .expect("scroll-preservation insertBefore setup should evaluate");
let parser_target = page_vm
.vm()
.document_runtime
- .get_element_by_id("parser-scroll-anchor-insert-before")
- .expect("parser scroll-anchor insertBefore target should exist");
+ .get_element_by_id("parser-scroll-preservation-insert-before")
+ .expect("parser scroll-preservation insertBefore target should exist");
let (parser_detached_parent, parser_reference) = {
let dom_host = page_vm.vm_mut().document_runtime.dom_host_mut();
let detached_parent = dom_host.create_parser_element_without_attributes(
@@ -10550,23 +10550,23 @@ window.scrollTo(0, 30);
child: parser_target,
reference_child: Some(parser_reference),
},
- "parser scroll-anchor insertBefore reparent mutation should apply",
+ "parser scroll-preservation insertBefore reparent mutation should apply",
);
if !custom_element_reaction_roots.is_empty() {
page_vm
.vm_mut()
.queue_and_run_pending_parser_post_step_runtime_work_in_default_context_for_test(custom_element_reaction_roots)
- .expect("parser scroll-anchor insertBefore reparent reactions should dispatch");
+ .expect("parser scroll-preservation insertBefore reparent reactions should dispatch");
}
let result = page_vm
.evaluate_expression(
r#"JSON.stringify({
- js: window.parserScrollAnchorInsertBeforeJsState,
+ js: window.parserScrollInsertBeforeJsState,
parserOffset: window.pageYOffset
})"#,
)
- .expect("scroll-anchor insertBefore result should evaluate");
+ .expect("scroll-preservation insertBefore result should evaluate");
let parser_children = page_vm
.vm()
.document_runtime
@@ -10576,14 +10576,14 @@ window.scrollTo(0, 30);
assert_eq!(
parser_children,
vec![parser_target, parser_reference],
- "parser insertBefore should move the scroll-anchor target before the native reference child"
+ "parser insertBefore should move the scroll-preservation target before the native reference child"
);
assert_eq!(
result.get("value").and_then(serde_json::Value::as_str),
Some(
- r#"{"js":{"offset":10,"parentIsDetached":true,"nextIsReference":true},"parserOffset":10}"#
+ r#"{"js":{"offset":30,"parentIsDetached":true,"nextIsReference":true},"parserOffset":30}"#
),
- "parser InsertBefore reparent to a disconnected parent should apply the same scroll-anchor adjustment as JS insertBefore"
+ "parser InsertBefore reparent to a disconnected parent should preserve the scroll offset like JS insertBefore"
);
}));
}
diff --git a/moli-renderer-v8/src/script_vm/tests/mouse_snapshot.rs b/moli-renderer-v8/src/script_vm/tests/mouse_snapshot.rs
index 67484f5cc..839a21d98 100644
--- a/moli-renderer-v8/src/script_vm/tests/mouse_snapshot.rs
+++ b/moli-renderer-v8/src/script_vm/tests/mouse_snapshot.rs
@@ -322,3 +322,64 @@ fn document_scroll_readback_matches_live_window_offsets() {
assert_eq!(vm.eval(geometry).unwrap(), frozen);
assert_eq!(vm.layout_pass_observability_for_test().1, before);
}
+
+#[test]
+fn dom_mutations_preserve_scroll_without_refreshing_layout() {
+ // Cover nodes above, crossing, and spanning the viewport. Their removal
+ // must not estimate a scroll adjustment from the old frozen rectangle.
+ for (top, height) in [(300, 200), (800, 200), (800, 2000)] {
+ for (mutation, remaining_height) in [
+ ("target.remove()", 0),
+ ("target.replaceWith(replacement)", 1500),
+ ("document.body.replaceChild(replacement,target)", 1500),
+ ("document.createDocumentFragment().appendChild(target)", 0),
+ (
+ "const detached=document.createElement('div'); detached.appendChild(document.createElement('span')); detached.insertBefore(target,detached.firstChild)",
+ 0,
+ ),
+ ] {
+ let mut vm = new_parsed_test_vm(
+ "https://scroll-preservation.test/",
+ &format!(
+ r#"<!doctype html><body style="margin:0;width:3000px">
+ <div style="height:{top}px">before</div>
+ <div id="target" style="height:{height}px">replace</div>
+ <div id="marker" style="height:5000px">kept</div>"#
+ ),
+ );
+ refresh_layout_for_test(&mut vm);
+ vm.eval(
+ r#"scrollTo(120,900);
+ window.replacement=document.createDocumentFragment();
+ const added=document.createElement('div'); added.style.height='1500px';
+ replacement.appendChild(added);"#,
+ )
+ .unwrap();
+ refresh_layout_for_test(&mut vm);
+ let layouts = vm.layout_pass_observability_for_test().1;
+ let offsets = "JSON.stringify([scrollX,scrollY,document.scrollingElement.scrollLeft,document.scrollingElement.scrollTop])";
+ let marker_top = "String(marker.getBoundingClientRect().top)";
+ let frozen_top = (top + height - 900).to_string();
+ assert_eq!(vm.eval(offsets).unwrap(), "[120,900,120,900]");
+ assert_eq!(vm.eval(marker_top).unwrap(), frozen_top);
+
+ vm.eval(mutation).unwrap();
+ assert_eq!(
+ vm.eval(offsets).unwrap(),
+ "[120,900,120,900]",
+ "top={top}, height={height}, mutation={mutation}"
+ );
+ assert_eq!(vm.eval(marker_top).unwrap(), frozen_top);
+ assert_eq!(vm.layout_pass_observability_for_test().1, layouts);
+
+ // Publishing the new layout changes geometry without introducing
+ // automatic scroll anchoring at publication time either.
+ refresh_layout_for_test(&mut vm);
+ assert_eq!(vm.eval(offsets).unwrap(), "[120,900,120,900]");
+ assert_eq!(
+ vm.eval(marker_top).unwrap(),
+ (top + remaining_height - 900).to_string()
+ );
+ }
+ }
+}
diff --git a/moli-renderer-v8/src/window_host.rs b/moli-renderer-v8/src/window_host.rs
index a71df877f..2eeb53dcf 100644
--- a/moli-renderer-v8/src/window_host.rs
+++ b/moli-renderer-v8/src/window_host.rs
@@ -1037,11 +1037,6 @@ pub(crate) fn scroll_window_to(
queue_scroll_observable_effects(scope, host_ptr, document, true);
}
-pub(crate) fn current_window_scroll_position(scope: &mut v8::PinScope<'_, '_>) -> (f64, f64) {
- let global = scope.get_current_context().global(scope);
- (scroll_x(scope, global), scroll_y(scope, global))
-}
-
pub(crate) fn window_get_computed_style_callback<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: v8::FunctionCallbackArguments<'s>,