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

Signed-off-by: Martin Robinson <mrobinson@igalia.com>

components/media/Cargo.toml

@@ -12,6 +12,7 @@ name = "media"
 path = "lib.rs"
 
 [dependencies]
+compositing_traits = { workspace = true }
 euclid = { workspace = true }
 fnv = { workspace = true }
 ipc-channel = { workspace = true }
@@ -20,4 +21,3 @@ serde = { workspace = true }
 servo-media = { workspace = true }
 servo_config = { path = "../config" }
 webrender_api = { workspace = true }
-webrender_traits = { workspace = true }

components/media/lib.rs

@@ -9,16 +9,16 @@ mod media_thread;
 
 use std::sync::{Arc, Mutex};
 
+use compositing_traits::{
+    WebrenderExternalImageApi, WebrenderExternalImageHandlers, WebrenderExternalImageRegistry,
+    WebrenderImageHandlerType, WebrenderImageSource,
+};
 use euclid::default::Size2D;
 use ipc_channel::ipc::{IpcReceiver, IpcSender, channel};
 use log::warn;
 use serde::{Deserialize, Serialize};
 use servo_config::pref;
 pub use servo_media::player::context::{GlApi, GlContext, NativeDisplay, PlayerGLContext};
-use webrender_traits::{
-    WebrenderExternalImageApi, WebrenderExternalImageHandlers, WebrenderExternalImageRegistry,
-    WebrenderImageHandlerType, WebrenderImageSource,
-};
 
 use crate::media_thread::GLPlayerThread;
 

components/media/media_thread.rs

@@ -5,11 +5,11 @@
 use std::sync::{Arc, Mutex};
 use std::thread;
 
+use compositing_traits::{WebrenderExternalImageRegistry, WebrenderImageHandlerType};
 use fnv::FnvHashMap;
 use ipc_channel::ipc::{IpcSender, channel};
 use log::{trace, warn};
 use webrender_api::ExternalImageId;
-use webrender_traits::{WebrenderExternalImageRegistry, WebrenderImageHandlerType};
 
 /// GL player threading API entry point that lives in the
 /// constellation.