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 <mrobinson@igalia.com>

components/layout/context.rs

@@ -56,13 +56,11 @@ pub enum ResolvedImage<'a> {
 pub enum ResolveImageError {
     LoadError,
     ImagePending,
-    ImageRequested,
     OnlyMetadata,
     InvalidUrl,
     MissingNode,
     ImageMissingFromImageSet,
-    FailedToResolveImageFromImageSet,
+    NotImplementedYet,
-    NotImplementedYet(&'static str),
     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::CrossFade(_) => Result::Err(ResolveImageError::NotImplementedYet),
-            Image::PaintWorklet(_) => {
+            Image::PaintWorklet(_) => Result::Err(ResolveImageError::NotImplementedYet),
-                Result::Err(ResolveImageError::NotImplementedYet("PaintWorklet"))
-            },
             Image::Gradient(gradient) => Ok(ResolvedImage::Gradient(gradient)),
             Image::Url(image_url) => {
                 // FIXME: images won’t always have in intrinsic width or

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);

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 {

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 {

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::*;

components/layout/lib.rs

@@ -8,9 +8,9 @@
 //! painted.
 
 mod cell;
-pub mod context;
+mod context;
-pub mod display_list;
+mod display_list;
-pub mod dom;
+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(crate) use flow::BoxTree;
-pub use fragment_tree::FragmentTree;
+pub(crate) use fragment_tree::FragmentTree;
 pub use layout_impl::LayoutFactoryImpl;
 use malloc_size_of_derive::MallocSizeOf;
 use servo_arc::Arc as ServoArc;

components/layout/taffy/stylo_taffy/mod.rs

@@ -6,4 +6,4 @@
 
 mod convert;
 mod wrapper;
-pub use wrapper::TaffyStyloStyle;
+pub(crate) use wrapper::TaffyStyloStyle;