commit ce6a636d75a2aa4e0c7debd753a577eb4016ef12
parent 0e2616357053e09714be2626f9f77d37bea95372
Author: Nicolas Silva <nical@fastmail.com>
Date: Mon, 15 Dec 2025 10:53:23 +0000
Bug 1998913 - Part 17 - Remove unnecessary reexports. r=gfx-reviewers,gw
Differential Revision: https://phabricator.services.mozilla.com/D276389
Diffstat:
7 files changed, 5 insertions(+), 39 deletions(-)
diff --git a/gfx/wr/webrender/src/composite.rs b/gfx/wr/webrender/src/composite.rs
@@ -6,11 +6,12 @@ use api::{BorderRadius, ColorF, ExternalImageId, ImageBufferKind, ImageKey, Imag
use api::units::*;
use api::ColorDepth;
use crate::image_source::resolve_image;
+use crate::picture::ResolvedSurfaceTexture;
use crate::renderer::GpuBufferBuilderF;
use euclid::Box2D;
use crate::gpu_types::{ZBufferId, ZBufferIdGenerator};
use crate::internal_types::{FrameAllocator, FrameMemory, FrameVec, TextureSource};
-use crate::picture::{ImageDependency, ResolvedSurfaceTexture};
+use crate::invalidation::compare::ImageDependency;
use crate::tile_cache::{TileCacheInstance, TileSurface};
use crate::tile_cache::TileId;
use crate::prim_store::DeferredResolve;
diff --git a/gfx/wr/webrender/src/frame_builder.rs b/gfx/wr/webrender/src/frame_builder.rs
@@ -16,7 +16,7 @@ use crate::debug_item::DebugItem;
use crate::gpu_types::{ImageBrushPrimitiveData, PrimitiveHeaders, TransformPalette, ZBufferIdGenerator};
use crate::gpu_types::{QuadSegment, TransformData};
use crate::internal_types::{FastHashMap, PlaneSplitter, FrameStamp};
-use crate::picture::{DirtyRegion};
+use crate::invalidation::DirtyRegion;
use crate::tile_cache::{SliceId, TileCacheInstance};
use crate::picture::{SurfaceInfo, SurfaceIndex, ResolvedSurfaceTexture};
use crate::picture::{SubpixelMode, RasterConfig, PictureCompositeMode};
diff --git a/gfx/wr/webrender/src/invalidation/cached_surface.rs b/gfx/wr/webrender/src/invalidation/cached_surface.rs
@@ -9,10 +9,10 @@ use smallvec::SmallVec;
use crate::ItemUid;
use crate::composite::CompositeState;
use crate::internal_types::{FastHashMap, FrameId};
+use crate::invalidation::compare::ImageDependency;
use crate::invalidation::compare::{ColorBinding, OpacityBinding, OpacityBindingInfo, PrimitiveComparisonKey};
use crate::invalidation::compare::{SpatialNodeComparer, PrimitiveComparer, PrimitiveDependency, ColorBindingInfo};
use crate::invalidation::{InvalidationReason, PrimitiveCompareResult, quadtree::TileNode};
-use crate::picture::ImageDependency;
use crate::picture::{PictureCompositeMode, SurfaceIndex, clampf};
use crate::print_tree::PrintTreePrinter;
use crate::resource_cache::ResourceCache;
diff --git a/gfx/wr/webrender/src/invalidation/compare.rs b/gfx/wr/webrender/src/invalidation/compare.rs
@@ -10,7 +10,7 @@
use api::{ImageKey, PropertyBindingId, ColorU};
use euclid::approxeq::ApproxEq;
-use crate::PrimitiveCompareResult;
+use crate::invalidation::PrimitiveCompareResult;
use crate::spatial_tree::{SpatialTree, SpatialNodeIndex, CoordinateSpaceMapping};
use crate::internal_types::{FastHashMap, FastHashSet, FrameId};
use crate::intern::ItemUid;
diff --git a/gfx/wr/webrender/src/invalidation/mod.rs b/gfx/wr/webrender/src/invalidation/mod.rs
@@ -131,29 +131,3 @@ pub enum PrimitiveCompareResult {
/// The value of a color binding changed
ColorBinding,
}
-
-/// Optional extra information returned by is_same when
-/// logging is enabled.
-#[derive(Debug, Copy, Clone, PartialEq)]
-#[cfg_attr(feature = "capture", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
-pub enum CompareHelperResult<T> {
- /// Primitives match
- Equal,
- /// Counts differ
- Count {
- prev_count: u8,
- curr_count: u8,
- },
- /// Sentinel
- Sentinel,
- /// Two items are not equal
- NotEqual {
- prev: T,
- curr: T,
- },
- /// User callback returned true on item
- PredicateTrue {
- curr: T
- },
-}
diff --git a/gfx/wr/webrender/src/lib.rs b/gfx/wr/webrender/src/lib.rs
@@ -194,11 +194,6 @@ pub use crate::screen_capture::{AsyncScreenshotHandle, RecordedFrameHandle};
pub use crate::texture_cache::TextureCacheConfig;
pub use api as webrender_api;
pub use webrender_build::shader::{ProgramSourceDigest, ShaderKind};
-pub use crate::tile_cache::TileId;
-pub use crate::invalidation::cached_surface::CachedSurfaceDescriptor;
-pub use crate::invalidation::InvalidationReason;
-pub use crate::invalidation::{PrimitiveCompareResult, CompareHelperResult};
-pub use crate::picture::{TileNode, TileNodeKind};
pub use crate::tile_cache::TileOffset;
pub use crate::intern::ItemUid;
pub use crate::render_api::*;
diff --git a/gfx/wr/webrender/src/picture.rs b/gfx/wr/webrender/src/picture.rs
@@ -137,10 +137,6 @@ use crate::tile_cache::{TileKey, SubSliceIndex};
use crate::invalidation::InvalidationReason;
use crate::tile_cache::MAX_SURFACE_SIZE;
-pub use crate::invalidation::DirtyRegion;
-pub use crate::invalidation::compare::ImageDependency;
-pub use crate::invalidation::quadtree::{TileNode, TileNodeKind};
-
pub use crate::picture_composite_mode::{PictureCompositeMode, prepare_composite_mode};
// Maximum blur radius for blur filter (different than box-shadow blur).
