Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(cssom): refresh child media after iframe resize

ldm02f5c7599d3c3
diff --git a/moli-renderer-v8/src/native_bridge/context_host/host_environment.rs b/moli-renderer-v8/src/native_bridge/context_host/host_environment.rs
index dbd3c4609..028b130db 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/host_environment.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/host_environment.rs
@@ -2337,6 +2337,15 @@ impl JsContextHost {
if style_mutation_effects_affect_layout_metric(effects) {
self.clear_layout_rect_cache();
}
+ let changed_iframe_attributes = effects.iter().filter_map(|effect| {
+ let StyleMutationEffect::Attribute { element, name, .. } = effect else {
+ return None;
+ };
+ (StyleAttributeImpact::for_attribute_name(name).affects_layout_metric()
+ && self.dom_host().is_html_element_named(*element, "iframe"))
+ .then_some(*element)
+ });
+ self.invalidate_published_frame_viewports(changed_iframe_attributes);
let validity_containers = self.validity_containers_for_child_list_mutations(effects);
let dom_host = self.dom_host() as *const _;
let emulated_media = self.emulated_media().clone();
diff --git a/moli-renderer-v8/src/native_bridge/context_host/layout.rs b/moli-renderer-v8/src/native_bridge/context_host/layout.rs
index 717565abe..5c9ff1e76 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/layout.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/layout.rs
@@ -180,6 +180,27 @@ impl JsContextHost {
.frame_viewport(frame)
}
+ pub(crate) fn invalidate_published_frame_viewports(
+ &self,
+ frames: impl IntoIterator<Item = DomHandle>,
+ ) {
+ let frames = frames.into_iter().collect::<Vec<_>>();
+ if frames.is_empty() {
+ return;
+ }
+ let changed = {
+ let mut state = self.document_layout_state.borrow_mut();
+ let changed =
+ state.update_frame_viewports(frames.into_iter().map(|frame| (frame, None)));
+ state.clear_latest_layout();
+ changed
+ };
+ if changed {
+ self.style_viewport_generation
+ .set(self.style_viewport_generation.get().saturating_add(1));
+ }
+ }
+
#[cfg(debug_assertions)]
pub(crate) fn style_viewport_generation(&self) -> u64 {
self.style_viewport_generation.get()
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/stylesheet_and_document_lifecycle.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/stylesheet_and_document_lifecycle.rs
index c8490bbfc..c8e0bacf9 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/stylesheet_and_document_lifecycle.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/stylesheet_and_document_lifecycle.rs
@@ -1093,6 +1093,7 @@ fn computed_style_child_document_media_queries_use_iframe_viewport() {
childDocument.open();
childDocument.write('<style>body { color: red } @media all and (min-width: 101px) { body { color: green } }</style><body>text</body>');
childDocument.close();
+ document.body.offsetTop;
const before = getComputedStyle(childDocument.body).color;
frame.style.width = '200px';
const after = getComputedStyle(childDocument.body).color;
@@ -1512,21 +1513,22 @@ fn nested_iframe_cached_viewport_units_follow_recursive_frame_resizes() {
"#;
let after = vm
.eval(query)
- .expect("warm queries retain the published frame viewports");
- assert_eq!(after, "200|160|100|80|10px|8px|4px|10px|8px");
+ .expect("warm queries refresh invalidated frame viewports");
+ assert_eq!(after, "100|80|50|40|5px|4px|2px|5px|4px");
assert_eq!(
vm.retained_style_system_update_count_for_document_for_test(inner_document),
- updates
+ updates + 1,
+ "warm observation must consume the changed viewport once"
);
publish_layout_for_test(&mut vm);
let refreshed = vm
.eval(query)
- .expect("explicit refresh updates recursive frame viewports");
+ .expect("explicit refresh retains the already current recursive frame viewports");
assert_eq!(refreshed, "100|80|50|40|5px|4px|2px|5px|4px");
assert_eq!(
vm.retained_style_system_update_count_for_document_for_test(inner_document),
updates + 1,
- "the innermost Document should consume one recursive viewport transition",
+ "explicit refresh must not consume the viewport transition a second time",
);
assert_eq!(
vm.retained_stylist_identity_for_document_for_test(inner_document),