Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions Libraries/LibWeb/Rust/src/layout/fragment_tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ pub(crate) struct RunFragmentBuilder {
root_node: crate::layout::node_data::NodeSlotId,
root_containing_block_slot: Option<u32>,
is_entry_accumulator: bool,
saw_svg_payload_write: Cell<bool>,
inner: std::cell::RefCell<RunFragmentBuilderInner>,
}

Expand Down Expand Up @@ -351,7 +350,6 @@ impl RunFragmentBuilder {
root_node,
root_containing_block_slot: root_containing_block.map(|node| node.slot_index()),
is_entry_accumulator: false,
saw_svg_payload_write: Cell::new(false),
inner: std::cell::RefCell::new(RunFragmentBuilderInner::default()),
}
}
Expand All @@ -361,7 +359,6 @@ impl RunFragmentBuilder {
root_node,
root_containing_block_slot: None,
is_entry_accumulator: true,
saw_svg_payload_write: Cell::new(false),
inner: std::cell::RefCell::new(RunFragmentBuilderInner::default()),
}
}
Expand All @@ -370,10 +367,6 @@ impl RunFragmentBuilder {
self.root_node
}

pub(crate) fn note_svg_payload_write(&self) {
self.saw_svg_payload_write.set(true);
}

pub(crate) fn register_pending_abspos(
&self,
coordinate_space_box: crate::layout::node_data::NodeSlotId,
Expand Down Expand Up @@ -719,31 +712,6 @@ impl RunFragmentBuilder {
for candidate in &mut propagated_anchor_candidates {
propagate_payload_toward_run_root_space(candidate, self.root_node, records, callbacks);
}
if self.saw_svg_payload_write.take() {
refresh_svg_payloads_from_records(&mut inner.top_scope_links, records);
}
(inner.top_scope_links, propagated_pending_abspos, propagated_anchor_candidates)
}
}

fn refresh_svg_payloads_from_records(links: &mut [FragmentLink], records: &RunRecords) {
for link in links {
let Some(owned_record) = records.used_values_if_owned(link.fragment.node) else {
continue;
};
let fragment = &mut *link.fragment;
if let Some(rare_cell) = owned_record.rare_data.get() {
let mut rare = rare_cell.borrow_mut();
if rare.computed_svg_transforms.is_some() {
fragment.computed_svg_transforms = rare.computed_svg_transforms;
}
if rare.svg_viewport_size.is_some() {
fragment.svg_viewport_size = rare.svg_viewport_size;
}
if let Some(path) = rare.computed_svg_path.take() {
fragment.computed_svg_path.set(Some(path));
}
}
refresh_svg_payloads_from_records(&mut fragment.children, records);
}
}
9 changes: 0 additions & 9 deletions Libraries/LibWeb/Rust/src/layout/svg_formatting_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -515,19 +515,11 @@ impl SvgFormattingContext {
has_transforms.then_some(transforms)
}

fn note_svg_payload_write(&self) {
if let Some(fragments) = &self.fragments {
fragments.note_svg_payload_write();
}
}

fn set_computed_transforms(&self, node: Node, transforms: FfiSvgComputedTransforms) {
self.note_svg_payload_write();
self.used_values(node).rare_data_mut().computed_svg_transforms = Some(transforms);
}

fn set_svg_viewport_size(&self, node: Node, viewport_size: FfiCssPixelSize) {
self.note_svg_payload_write();
self.used_values(node).rare_data_mut().svg_viewport_size = Some(viewport_size);
}

Expand Down Expand Up @@ -975,7 +967,6 @@ impl SvgFormattingContext {
let used = &used_pointer;
used.set_content_inline_size(transformed_bounding_box.width);
used.set_content_block_size(transformed_bounding_box.height);
self.note_svg_payload_write();
self.used_values(graphics_box).rare_data_mut().computed_svg_path = Some(path);
self.place_child(graphics_box, transformed_bounding_box.x, transformed_bounding_box.y);
used.has_definite_inline_size.set(true);
Expand Down
Loading