diff options
author | Martin Robinson <mrobinson@igalia.com> | 2024-05-28 14:48:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-28 12:48:55 +0000 |
commit | 02893770910bb1db27a5a3df80b0c98eeaa7d215 (patch) | |
tree | ff843804fa97f320f43eba6740ba6c76ace94b24 /components/compositing | |
parent | 277eb87cc038480d105234aa5f2b70c1c5725178 (diff) | |
download | servo-02893770910bb1db27a5a3df80b0c98eeaa7d215.tar.gz servo-02893770910bb1db27a5a3df80b0c98eeaa7d215.zip |
Move `RenderingContext` to `webrender_traits` (#32386)
The `gfx_traits` crate is gradually become just about text and fonts and
this is one of the few things there that is standing in the way of this.
Eventually `webrender_traits` will be the general cross-process
compositor API, so this sort of makes sense as well.
Diffstat (limited to 'components/compositing')
-rw-r--r-- | components/compositing/compositor.rs | 4 | ||||
-rw-r--r-- | components/compositing/lib.rs | 2 | ||||
-rw-r--r-- | components/compositing/windowing.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index aa118066d49..0dde3e1ae28 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -21,7 +21,6 @@ use crossbeam_channel::Sender; use embedder_traits::Cursor; use euclid::{Point2D, Rect, Scale, Transform3D, Vector2D}; use fnv::{FnvHashMap, FnvHashSet}; -use gfx::rendering_context::RenderingContext; use image::{DynamicImage, ImageFormat}; use ipc_channel::ipc; use libc::c_void; @@ -49,7 +48,8 @@ use webrender_api::{ use webrender_traits::display_list::{HitTestInfo, ScrollTree}; use webrender_traits::{ CanvasToCompositorMsg, CompositorHitTestResult, FontToCompositorMsg, ImageUpdate, - NetToCompositorMsg, ScriptToCompositorMsg, SerializedImageUpdate, UntrustedNodeAddress, + NetToCompositorMsg, RenderingContext, ScriptToCompositorMsg, SerializedImageUpdate, + UntrustedNodeAddress, }; use crate::gl::RenderTargetInfo; diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs index 1be60c17691..d28e5e853b4 100644 --- a/components/compositing/lib.rs +++ b/components/compositing/lib.rs @@ -8,10 +8,10 @@ use std::rc::Rc; use compositing_traits::{CompositorProxy, CompositorReceiver, ConstellationMsg}; use crossbeam_channel::Sender; -use gfx::rendering_context::RenderingContext; use profile_traits::{mem, time}; use webrender::RenderApi; use webrender_api::DocumentId; +use webrender_traits::RenderingContext; pub use crate::compositor::{CompositeTarget, IOCompositor, ShutdownState}; diff --git a/components/compositing/windowing.rs b/components/compositing/windowing.rs index 62d3ee7459c..8e9b89ccadd 100644 --- a/components/compositing/windowing.rs +++ b/components/compositing/windowing.rs @@ -10,7 +10,6 @@ use std::time::Duration; use base::id::{PipelineId, TopLevelBrowsingContextId}; use embedder_traits::{EmbedderProxy, EventLoopWaker}; use euclid::Scale; -use gfx::rendering_context::RenderingContext; use keyboard_types::KeyboardEvent; use libc::c_void; use script_traits::{ @@ -22,6 +21,7 @@ use servo_url::ServoUrl; use style_traits::DevicePixel; use webrender_api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize, DevicePoint, DeviceRect}; use webrender_api::ScrollLocation; +use webrender_traits::RenderingContext; #[derive(Clone)] pub enum MouseWindowEvent { |