aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_layout_interface
diff options
context:
space:
mode:
authorbors-servo <infra@servo.org>2023-07-10 20:35:59 +0200
committerGitHub <noreply@github.com>2023-07-10 20:35:59 +0200
commit71c3b34384030dcb734b268ec2eb693be807b3f7 (patch)
treee4344d74de73bf1b120a4f21929e5d3b802141af /components/script_layout_interface
parent734d8b3d49aff8f15f2cb63e85817576dd54232c (diff)
parent3230162fd0ac96dea77c683b2067ae65ec7ed0b4 (diff)
downloadservo-71c3b34384030dcb734b268ec2eb693be807b3f7.tar.gz
servo-71c3b34384030dcb734b268ec2eb693be807b3f7.zip
Auto merge of #29987 - mrobinson:normalize-more-webrender-use-statements, r=jdm
normalize more webrender use statements - Use the WebRender clip chain API - Use explicit WebRender hit test items in legacy layout - Try to `use` WebRender types more <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes do not require tests because they do not change behavior. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/script_layout_interface')
-rw-r--r--components/script_layout_interface/lib.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/components/script_layout_interface/lib.rs b/components/script_layout_interface/lib.rs
index bdf6ae9e884..375377262d7 100644
--- a/components/script_layout_interface/lib.rs
+++ b/components/script_layout_interface/lib.rs
@@ -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)>,
}