diff options
| author | Martin Robinson <mrobinson@igalia.com> | 2025-04-06 19:34:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-06 17:34:18 +0000 |
| commit | 0caa271176d4670eb06bedd05cdffb24df08fc4f (patch) | |
| tree | 9a0c3431dcf7ac31cfbdc1f801c9f4ef3dda6ae7 /components/shared/net | |
| parent | e74a042efdf01ab2ff32e82e203bd1d954b599bd (diff) | |
| download | servo-0caa271176d4670eb06bedd05cdffb24df08fc4f.tar.gz servo-0caa271176d4670eb06bedd05cdffb24df08fc4f.zip | |
`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>
Diffstat (limited to 'components/shared/net')
| -rw-r--r-- | components/shared/net/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/shared/net/image_cache.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/shared/net/Cargo.toml b/components/shared/net/Cargo.toml index 511460b4f98..d4b30fb86e5 100644 --- a/components/shared/net/Cargo.toml +++ b/components/shared/net/Cargo.toml @@ -15,6 +15,7 @@ doctest = false [dependencies] base = { workspace = true } +compositing_traits = { workspace = true } content-security-policy = { workspace = true } cookie = { workspace = true } crossbeam-channel = { workspace = true } @@ -38,4 +39,3 @@ servo_rand = { path = "../../rand" } servo_url = { path = "../../url" } url = { workspace = true } uuid = { workspace = true } -webrender_traits = { workspace = true } diff --git a/components/shared/net/image_cache.rs b/components/shared/net/image_cache.rs index abe0385c71a..7b6d364af58 100644 --- a/components/shared/net/image_cache.rs +++ b/components/shared/net/image_cache.rs @@ -5,13 +5,13 @@ use std::sync::Arc; use base::id::PipelineId; +use compositing_traits::CrossProcessCompositorApi; use ipc_channel::ipc::IpcSender; use log::debug; use malloc_size_of_derive::MallocSizeOf; use pixels::{Image, ImageMetadata}; use serde::{Deserialize, Serialize}; use servo_url::{ImmutableOrigin, ServoUrl}; -use webrender_traits::CrossProcessCompositorApi; use crate::FetchResponseMsg; use crate::request::CorsSettings; |