Try to use WebRender types more

The newer versions of WebRender move types around between `webrender` and
`webrender_api` and this will reduce the churn during the upgrade.
This commit is contained in:
Martin Robinson 2023-07-10 15:54:39 +02:00
parent 1543912589
commit 3230162fd0
No known key found for this signature in database
GPG key ID: D56AA4FA55EFE6F8
39 changed files with 330 additions and 327 deletions

View file

@ -27,6 +27,7 @@ use servo_url::{ImmutableOrigin, ServoUrl};
use std::any::Any;
use std::sync::atomic::AtomicIsize;
use style::data::ElementData;
use webrender_api::ImageKey;
#[derive(MallocSizeOf)]
pub struct StyleData {
@ -121,9 +122,9 @@ pub enum LayoutElementType {
}
pub enum HTMLCanvasDataSource {
WebGL(webrender_api::ImageKey),
WebGL(ImageKey),
Image(Option<IpcSender<CanvasMsg>>),
WebGPU(webrender_api::ImageKey),
WebGPU(ImageKey),
}
pub struct HTMLCanvasData {
@ -162,5 +163,5 @@ pub struct PendingImage {
}
pub struct HTMLMediaData {
pub current_frame: Option<(webrender_api::ImageKey, i32, i32)>,
pub current_frame: Option<(ImageKey, i32, i32)>,
}