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

Update WR (CPU text optimizations, image format renames).

Browse source
This commit is contained in:
Glenn Watson 2017-06-16 15:27:22 +10:00
parent e3a52536b6
commit e7b1e041c8
9 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/canvas/canvas_paint_thread.rs
View file

@ -564,7 +564,7 @@ impl<'a> CanvasPaintThread<'a> {
width: size.width as u32,
height: size.height as u32,
stride: None,
format: webrender_traits::ImageFormat::RGBA8,
format: webrender_traits::ImageFormat::BGRA8,
offset: 0,
is_opaque: false,
};

2
components/canvas/webgl_paint_thread.rs
View file

@ -254,7 +254,7 @@ impl WebGLPaintThread {
width: width as u32,
height: height as u32,
stride: None,
format: webrender_traits::ImageFormat::RGBA8,
format: webrender_traits::ImageFormat::BGRA8,
offset: 0,
is_opaque: false,
};

2
components/layout/display_list_builder.rs
View file

@ -1951,7 +1951,7 @@ impl FragmentDisplayListBuilding for Fragment {
webrender_image: WebRenderImageInfo {
width: computed_width as u32,
height: computed_height as u32,
format: PixelFormat::RGBA8,
format: PixelFormat::BGRA8,
key: Some(canvas_data.image_key),
},
image_data: None,

6
components/net/image_cache.rs
View file

@ -40,7 +40,7 @@ fn convert_format(format: PixelFormat) -> webrender_traits::ImageFormat {
panic!("Not support by webrender yet");
}
PixelFormat::RGB8 => webrender_traits::ImageFormat::RGB8,
PixelFormat::RGBA8 => webrender_traits::ImageFormat::RGBA8,
PixelFormat::BGRA8 => webrender_traits::ImageFormat::BGRA8,
}
}
@ -66,7 +66,7 @@ fn set_webrender_image_key(webrender_api: &webrender_traits::RenderApi, image: &
let format = convert_format(image.format);
let mut bytes = Vec::new();
bytes.extend_from_slice(&*image.bytes);
if format == webrender_traits::ImageFormat::RGBA8 {
if format == webrender_traits::ImageFormat::BGRA8 {
premultiply(bytes.as_mut_slice());
}
let descriptor = webrender_traits::ImageDescriptor {
@ -87,7 +87,7 @@ fn set_webrender_image_key(webrender_api: &webrender_traits::RenderApi, image: &
// Consider using SIMD to speed this up if it shows in profiles.
fn is_image_opaque(format: webrender_traits::ImageFormat, bytes: &[u8]) -> bool {
match format {
webrender_traits::ImageFormat::RGBA8 => {
webrender_traits::ImageFormat::BGRA8 => {
let mut is_opaque = true;
for i in 0..(bytes.len() / 4) {
if bytes[i * 4 + 3] != 255 {

4
components/net_traits/image/base.rs
View file

@ -16,7 +16,7 @@ pub enum PixelFormat {
/// RGB, 8 bits per channel
RGB8,
/// RGB + alpha, 8 bits per channel
RGBA8,
BGRA8,
}
#[derive(Clone, Deserialize, Serialize, HeapSizeOf)]
@ -83,7 +83,7 @@ pub fn load_from_memory(buffer: &[u8]) -> Option<Image> {
Some(Image {
width: rgba.width(),
height: rgba.height(),
format: PixelFormat::RGBA8,
format: PixelFormat::BGRA8,
bytes: IpcSharedMemory::from_bytes(&*rgba),
id: None,
})

2
components/script/dom/canvasrenderingcontext2d.rs
View file

@ -431,7 +431,7 @@ impl CanvasRenderingContext2D {
let image_size = Size2D::new(img.width as i32, img.height as i32);
let image_data = match img.format {
PixelFormat::RGBA8 => img.bytes.to_vec(),
PixelFormat::BGRA8 => img.bytes.to_vec(),
PixelFormat::K8 => panic!("K8 color type not supported"),
PixelFormat::RGB8 => panic!("RGB8 color type not supported"),
PixelFormat::KA8 => panic!("KA8 color type not supported"),

2
components/script/dom/paintworkletglobalscope.rs
View file

@ -75,7 +75,7 @@ impl PaintWorkletGlobalScope {
let image = Image {
width: width,
height: height,
format: PixelFormat::RGBA8,
format: PixelFormat::BGRA8,
bytes: IpcSharedMemory::from_bytes(&*self.buffer.borrow()),
id: None,
};

4
components/script/dom/webglrenderingcontext.rs
View file

@ -690,9 +690,9 @@ impl WebGLRenderingContext {
let size = Size2D::new(img.width as i32, img.height as i32);
// For now Servo's images are all stored as RGBA8 internally.
// For now Servo's images are all stored as BGRA8 internally.
let mut data = match img.format {
PixelFormat::RGBA8 => img.bytes.to_vec(),
PixelFormat::BGRA8 => img.bytes.to_vec(),
_ => unimplemented!(),
};