Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-27 23:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

compositing: Use webrender_api::ExternalImageSource instead of WebRenderImageSource (#38703)

Browse source 
There is no reason to roll our own type.

Motivation: I need `ExternalImageSource::Invalid`.

Testing: Covered by existing WPT tests, but it's just refactor

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
sagudev 2025-08-15 21:39:07 +02:00 • committed by GitHub
parent 18e05d3aab
commit 85588fada0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/shared/compositing/lib.rs
View file

@ -30,12 +30,13 @@ use euclid::default::Size2D as UntypedSize2D;
use ipc_channel::ipc::{self, IpcSharedMemory};
use profile_traits::mem::{OpaqueSender, ReportsChan};
use serde::{Deserialize, Serialize};
pub use webrender_api::ExternalImageSource;
use webrender_api::units::{LayoutVector2D, TexelRect};
use webrender_api::{
BuiltDisplayList, BuiltDisplayListDescriptor, ExternalImage, ExternalImageData,
ExternalImageHandler, ExternalImageId, ExternalImageSource, ExternalScrollId,
FontInstanceFlags, FontInstanceKey, FontKey, ImageData, ImageDescriptor, ImageKey,
NativeFontHandle, PipelineId as WebRenderPipelineId,
ExternalImageHandler, ExternalImageId, ExternalScrollId, FontInstanceFlags, FontInstanceKey,
FontKey, ImageData, ImageDescriptor, ImageKey, NativeFontHandle,
PipelineId as WebRenderPipelineId,
};
use crate::viewport_description::ViewportDescription;
@ -341,15 +342,10 @@ impl CrossProcessCompositorApi {
/// This trait is used to notify lock/unlock messages and get the
/// required info that WR needs.
pub trait WebrenderExternalImageApi {
fn lock(&mut self, id: u64) -> (WebrenderImageSource, UntypedSize2D<i32>);
fn lock(&mut self, id: u64) -> (ExternalImageSource, UntypedSize2D<i32>);
fn unlock(&mut self, id: u64);
}
pub enum WebrenderImageSource<'a> {
TextureHandle(u32),
Raw(&'a [u8]),
}
/// Type of Webrender External Image Handler.
pub enum WebrenderImageHandlerType {
WebGL,
@ -438,7 +434,7 @@ impl ExternalImageHandler for WebrenderExternalImageHandlers {
WebrenderImageHandlerType::WebGL => {
let (source, size) = self.webgl_handler.as_mut().unwrap().lock(key.0);
let texture_id = match source {
WebrenderImageSource::TextureHandle(b) => b,
ExternalImageSource::NativeTexture(b) => b,
_ => panic!("Wrong type"),
};
ExternalImage {
@ -449,7 +445,7 @@ impl ExternalImageHandler for WebrenderExternalImageHandlers {
WebrenderImageHandlerType::Media => {
let (source, size) = self.media_handler.as_mut().unwrap().lock(key.0);
let texture_id = match source {
WebrenderImageSource::TextureHandle(b) => b,
ExternalImageSource::NativeTexture(b) => b,
_ => panic!("Wrong type"),
};
ExternalImage {
@ -460,7 +456,7 @@ impl ExternalImageHandler for WebrenderExternalImageHandlers {
WebrenderImageHandlerType::WebGPU => {
let (source, size) = self.webgpu_handler.as_mut().unwrap().lock(key.0);
let buffer = match source {
WebrenderImageSource::Raw(b) => b,
ExternalImageSource::RawData(b) => b,
_ => panic!("Wrong type"),
};
ExternalImage {