diff options
| author | Nico Burns <nico@nicoburns.com> | 2024-12-12 22:35:03 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-12 09:35:03 +0000 |
| commit | c0703b605d9c22776548c2155790542312046763 (patch) | |
| tree | 11ce10ae1ee1eaede4b058037809e8125887c3af /components | |
| parent | 2a6986b8577fc9326018e325fbbf39d5ad90d5e8 (diff) | |
| download | servo-c0703b605d9c22776548c2155790542312046763.tar.gz servo-c0703b605d9c22776548c2155790542312046763.zip | |
Remove taffy-specific layout caching (#34589)
Signed-off-by: Nico Burns <nico@nicoburns.com>
Diffstat (limited to 'components')
| -rw-r--r-- | components/layout_2020/taffy/layout.rs | 9 | ||||
| -rw-r--r-- | components/layout_2020/taffy/mod.rs | 3 |
2 files changed, 1 insertions, 11 deletions
diff --git a/components/layout_2020/taffy/layout.rs b/components/layout_2020/taffy/layout.rs index d6db905d7cb..54403bf382f 100644 --- a/components/layout_2020/taffy/layout.rs +++ b/components/layout_2020/taffy/layout.rs @@ -3,7 +3,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use app_units::Au; -use atomic_refcell::{AtomicRef, AtomicRefCell, AtomicRefMut}; +use atomic_refcell::{AtomicRef, AtomicRefCell}; use style::properties::ComputedValues; use style::values::generics::length::{GenericLengthPercentageOrAuto, LengthPercentageOrAuto}; use style::values::specified::align::AlignFlags; @@ -92,7 +92,6 @@ impl taffy::TraversePartialTree for TaffyContainerContext<'_> { impl taffy::LayoutPartialTree for TaffyContainerContext<'_> { type CoreContainerStyle<'a> = TaffyStyloStyle<&'a ComputedValues> where Self: 'a; - type CacheMut<'b> = AtomicRefMut<'b, taffy::Cache> where Self: 'b; fn get_core_container_style(&self, _node_id: taffy::NodeId) -> Self::CoreContainerStyle<'_> { TaffyStyloStyle(self.style) @@ -103,12 +102,6 @@ impl taffy::LayoutPartialTree for TaffyContainerContext<'_> { (*self.source_child_nodes[id]).borrow_mut().taffy_layout = *layout; } - fn get_cache_mut(&mut self, node_id: taffy::NodeId) -> AtomicRefMut<'_, taffy::Cache> { - let id = usize::from(node_id); - let mut_ref: AtomicRefMut<'_, _> = (*self.source_child_nodes[id]).borrow_mut(); - AtomicRefMut::map(mut_ref, |node| &mut node.taffy_layout_cache) - } - fn compute_child_layout( &mut self, node_id: taffy::NodeId, diff --git a/components/layout_2020/taffy/mod.rs b/components/layout_2020/taffy/mod.rs index cdefacee97b..e0851f09944 100644 --- a/components/layout_2020/taffy/mod.rs +++ b/components/layout_2020/taffy/mod.rs @@ -73,7 +73,6 @@ impl TaffyContainer { #[derive(Serialize)] pub(crate) struct TaffyItemBox { - pub(crate) taffy_layout_cache: taffy::Cache, pub(crate) taffy_layout: taffy::Layout, pub(crate) child_fragments: Vec<Fragment>, #[serde(skip_serializing)] @@ -92,7 +91,6 @@ pub(crate) enum TaffyItemBoxInner { impl fmt::Debug for TaffyItemBox { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.debug_struct("TaffyItemBox") - .field("taffy_layout_cache", &self.taffy_layout_cache) .field("taffy_layout", &self.taffy_layout) .field("child_fragments", &self.child_fragments.len()) .field("style", &self.style) @@ -111,7 +109,6 @@ impl TaffyItemBox { }; Self { - taffy_layout_cache: Default::default(), taffy_layout: Default::default(), child_fragments: Vec::new(), positioning_context: PositioningContext::new_for_containing_block_for_all_descendants(), |