From a7b232ef4cbcf8516899599f92f72b6bc6378af9 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Sat, 2 Aug 2025 18:52:00 +0200 Subject: [PATCH] layout: Limit visibility of some types and removed unused enum variants / data (#38428) Testing: This change mainly removes dead code, so no tests necessary. Signed-off-by: Martin Robinson --- components/layout/context.rs | 10 +++------- components/layout/display_list/mod.rs | 4 ++-- components/layout/display_list/stacking_context.rs | 6 +----- components/layout/flow/mod.rs | 2 +- components/layout/fragment_tree/mod.rs | 2 +- components/layout/lib.rs | 14 +++++++------- components/layout/taffy/stylo_taffy/mod.rs | 2 +- 7 files changed, 16 insertions(+), 24 deletions(-) diff --git a/components/layout/context.rs b/components/layout/context.rs index 9efe148ba41..0efaa41d96e 100644 --- a/components/layout/context.rs +++ b/components/layout/context.rs @@ -56,13 +56,11 @@ pub enum ResolvedImage<'a> { pub enum ResolveImageError { LoadError, ImagePending, - ImageRequested, OnlyMetadata, InvalidUrl, MissingNode, ImageMissingFromImageSet, - FailedToResolveImageFromImageSet, - NotImplementedYet(&'static str), + NotImplementedYet, None, } @@ -242,10 +240,8 @@ impl ImageResolver { match image { // TODO: Add support for PaintWorklet and CrossFade rendering. Image::None => Result::Err(ResolveImageError::None), - Image::CrossFade(_) => Result::Err(ResolveImageError::NotImplementedYet("CrossFade")), - Image::PaintWorklet(_) => { - Result::Err(ResolveImageError::NotImplementedYet("PaintWorklet")) - }, + Image::CrossFade(_) => Result::Err(ResolveImageError::NotImplementedYet), + Image::PaintWorklet(_) => Result::Err(ResolveImageError::NotImplementedYet), Image::Gradient(gradient) => Ok(ResolvedImage::Gradient(gradient)), Image::Url(image_url) => { // FIXME: images won’t always have in intrinsic width or diff --git a/components/layout/display_list/mod.rs b/components/layout/display_list/mod.rs index 0db279cb10e..af58454317b 100644 --- a/components/layout/display_list/mod.rs +++ b/components/layout/display_list/mod.rs @@ -49,7 +49,7 @@ use wr::units::LayoutVector2D; use crate::cell::ArcRefCell; use crate::context::{ImageResolver, ResolvedImage}; -pub use crate::display_list::conversions::ToWebRender; +pub(crate) use crate::display_list::conversions::ToWebRender; use crate::display_list::stacking_context::StackingContextSection; use crate::fragment_tree::{ BackgroundMode, BoxFragment, Fragment, FragmentFlags, FragmentTree, SpecificLayoutInfo, Tag, @@ -68,7 +68,7 @@ mod gradient; mod stacking_context; use background::BackgroundPainter; -pub use stacking_context::*; +pub(crate) use stacking_context::*; // webrender's `ItemTag` is private. type ItemTag = (u64, u16); diff --git a/components/layout/display_list/stacking_context.rs b/components/layout/display_list/stacking_context.rs index 9dda6db2852..317dd7fa107 100644 --- a/components/layout/display_list/stacking_context.rs +++ b/components/layout/display_list/stacking_context.rs @@ -410,7 +410,6 @@ pub enum DebugPrintField { Contents, RealStackingContextsAndPositionedStackingContainers, FloatStackingContainers, - AtomicInlineStackingContainers, } impl StackingContext { @@ -581,7 +580,7 @@ impl StackingContext { pub(crate) fn build_canvas_background_display_list( &self, builder: &mut DisplayListBuilder, - fragment_tree: &crate::FragmentTree, + fragment_tree: &crate::fragment_tree::FragmentTree, ) { let Some(root_fragment) = fragment_tree.root_fragments.iter().find(|fragment| { fragment @@ -796,9 +795,6 @@ impl StackingContext { DebugPrintField::FloatStackingContainers => { self.float_stacking_containers[*index].debug_print_with_tree(tree); }, - DebugPrintField::AtomicInlineStackingContainers => { - // do nothing; we print these in DebugPrintField::Contents - }, } } match self.context_type { diff --git a/components/layout/flow/mod.rs b/components/layout/flow/mod.rs index 481247039c9..21ae2d97085 100644 --- a/components/layout/flow/mod.rs +++ b/components/layout/flow/mod.rs @@ -52,7 +52,7 @@ pub mod inline; mod root; pub(crate) use construct::BlockContainerBuilder; -pub use root::BoxTree; +pub(crate) use root::BoxTree; #[derive(Debug, MallocSizeOf)] pub(crate) struct BlockFormattingContext { diff --git a/components/layout/fragment_tree/mod.rs b/components/layout/fragment_tree/mod.rs index 8738f2a6af7..bdb503cecc3 100644 --- a/components/layout/fragment_tree/mod.rs +++ b/components/layout/fragment_tree/mod.rs @@ -15,6 +15,6 @@ pub(crate) use base_fragment::*; pub(crate) use box_fragment::*; pub(crate) use containing_block::*; pub(crate) use fragment::*; -pub use fragment_tree::*; +pub(crate) use fragment_tree::*; pub(crate) use hoisted_shared_fragment::*; pub(crate) use positioning_fragment::*; diff --git a/components/layout/lib.rs b/components/layout/lib.rs index ea254723dcb..41952d437b5 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -8,9 +8,9 @@ //! painted. mod cell; -pub mod context; -pub mod display_list; -pub mod dom; +mod context; +mod display_list; +mod dom; mod dom_traversal; mod flexbox; pub mod flow; @@ -24,18 +24,18 @@ mod taffy; mod construct_modern; mod lists; mod positioned; -pub mod query; +mod query; mod quotes; mod replaced; mod sizing; mod style_ext; pub mod table; -pub mod traversal; +mod traversal; use app_units::Au; pub use cell::ArcRefCell; -pub use flow::BoxTree; -pub use fragment_tree::FragmentTree; +pub(crate) use flow::BoxTree; +pub(crate) use fragment_tree::FragmentTree; pub use layout_impl::LayoutFactoryImpl; use malloc_size_of_derive::MallocSizeOf; use servo_arc::Arc as ServoArc; diff --git a/components/layout/taffy/stylo_taffy/mod.rs b/components/layout/taffy/stylo_taffy/mod.rs index 05eece6ace7..15ddaa2c244 100644 --- a/components/layout/taffy/stylo_taffy/mod.rs +++ b/components/layout/taffy/stylo_taffy/mod.rs @@ -6,4 +6,4 @@ mod convert; mod wrapper; -pub use wrapper::TaffyStyloStyle; +pub(crate) use wrapper::TaffyStyloStyle;