From 0caa271176d4670eb06bedd05cdffb24df08fc4f Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Sun, 6 Apr 2025 19:34:18 +0200 Subject: `compositing`: Combine `webrender_traits` and `compositing_traits` (#36372) These two traits both exposed different parts of the compositing API, but now that the compositor doesn't depend directly on `script` any longer and the `script_traits` crate has been split into the `constellation_traits` crate, this can be finally be cleaned up without causing circular dependencies. In addition, some unit tests for the `IOPCompositor`'s scroll node tree are also moved into `compositing_traits` as well. Testing: This just combines two crates, so no new tests are necessary. Fixes: #35984. Signed-off-by: Martin Robinson Signed-off-by: Martin Robinson --- components/shared/script/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/shared/script/lib.rs') diff --git a/components/shared/script/lib.rs b/components/shared/script/lib.rs index 1a35f4f7486..5ee143b3cdd 100644 --- a/components/shared/script/lib.rs +++ b/components/shared/script/lib.rs @@ -18,6 +18,7 @@ use base::id::{BrowsingContextId, HistoryStateId, PipelineId, PipelineNamespaceI #[cfg(feature = "bluetooth")] use bluetooth_traits::BluetoothRequest; use canvas_traits::webgl::WebGLPipeline; +use compositing_traits::CrossProcessCompositorApi; use constellation_traits::{ AnimationTickType, LoadData, NavigationHistoryBehavior, ScriptToConstellationChan, ScrollState, StructuredSerializedData, WindowSizeType, @@ -48,7 +49,6 @@ use stylo_atoms::Atom; use webgpu_traits::WebGPUMsg; use webrender_api::units::DevicePixel; use webrender_api::{DocumentId, ImageKey}; -use webrender_traits::CrossProcessCompositorApi; /// The initial data required to create a new layout attached to an existing script thread. #[derive(Debug, Deserialize, Serialize)] -- cgit v1.2.3