aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/compositing/compositor.rs3
-rw-r--r--components/net/image_cache.rs4
-rw-r--r--components/pixels/lib.rs90
-rw-r--r--components/script/canvas_state.rs4
-rw-r--r--components/script/dom/webglrenderingcontext.rs3
-rw-r--r--components/webdriver_server/lib.rs3
6 files changed, 73 insertions, 34 deletions
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index 74ada7b21c6..591470b60c9 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -1456,10 +1456,11 @@ impl IOCompositor {
format: PixelFormat::RGBA8,
frames: vec![ImageFrame {
delay: None,
- bytes: ipc::IpcSharedMemory::from_bytes(&image),
+ byte_range: 0..image.len(),
width: image.width(),
height: image.height(),
}],
+ bytes: ipc::IpcSharedMemory::from_bytes(&image),
id: None,
cors_status: CorsStatus::Safe,
}))
diff --git a/components/net/image_cache.rs b/components/net/image_cache.rs
index 46a2a4ea111..8276baa07e7 100644
--- a/components/net/image_cache.rs
+++ b/components/net/image_cache.rs
@@ -66,10 +66,10 @@ fn set_webrender_image_key(compositor_api: &CrossProcessCompositorApi, image: &m
return;
}
let mut bytes = Vec::new();
- let frame_bytes = image.bytes();
+ let frame_bytes = image.first_frame().bytes;
let is_opaque = match image.format {
PixelFormat::BGRA8 => {
- bytes.extend_from_slice(&frame_bytes);
+ bytes.extend_from_slice(frame_bytes);
pixels::rgba8_premultiply_inplace(bytes.as_mut_slice())
},
PixelFormat::RGB8 => {
diff --git a/components/pixels/lib.rs b/components/pixels/lib.rs
index c1f57875c6d..35b32c92414 100644
--- a/components/pixels/lib.rs
+++ b/components/pixels/lib.rs
@@ -4,6 +4,7 @@
use std::borrow::Cow;
use std::io::Cursor;
+use std::ops::Range;
use std::time::Duration;
use std::{cmp, fmt, vec};
@@ -126,13 +127,24 @@ pub struct Image {
pub format: PixelFormat,
pub id: Option<ImageKey>,
pub cors_status: CorsStatus,
+ pub bytes: IpcSharedMemory,
pub frames: Vec<ImageFrame>,
}
#[derive(Clone, Deserialize, MallocSizeOf, Serialize)]
pub struct ImageFrame {
pub delay: Option<Duration>,
- pub bytes: IpcSharedMemory,
+ /// References a range of the `bytes` field from the image that this
+ /// frame belongs to.
+ pub byte_range: Range<usize>,
+ pub width: u32,
+ pub height: u32,
+}
+
+/// A non-owning reference to the data of an [ImageFrame]
+pub struct ImageFrameView<'a> {
+ pub delay: Option<Duration>,
+ pub bytes: &'a [u8],
pub width: u32,
pub height: u32,
}
@@ -142,12 +154,19 @@ impl Image {
self.frames.len() > 1
}
- pub fn bytes(&self) -> IpcSharedMemory {
- self.frames
- .first()
- .expect("Should have at least one frame")
- .bytes
- .clone()
+ pub fn frames(&self) -> impl Iterator<Item = ImageFrameView> {
+ self.frames.iter().map(|frame| ImageFrameView {
+ delay: frame.delay,
+ bytes: self.bytes.get(frame.byte_range.clone()).unwrap(),
+ width: frame.width,
+ height: frame.height,
+ })
+ }
+
+ pub fn first_frame(&self) -> ImageFrameView {
+ self.frames()
+ .next()
+ .expect("All images should have at least one frame")
}
}
@@ -189,7 +208,7 @@ pub fn load_from_memory(buffer: &[u8], cors_status: CorsStatus) -> Option<Image>
rgba8_byte_swap_colors_inplace(&mut rgba);
let frame = ImageFrame {
delay: None,
- bytes: IpcSharedMemory::from_bytes(&rgba),
+ byte_range: 0..rgba.len(),
width: rgba.width(),
height: rgba.height(),
};
@@ -198,6 +217,7 @@ pub fn load_from_memory(buffer: &[u8], cors_status: CorsStatus) -> Option<Image>
height: rgba.height(),
format: PixelFormat::BGRA8,
frames: vec![frame],
+ bytes: IpcSharedMemory::from_bytes(&rgba),
id: None,
cors_status,
})
@@ -364,45 +384,61 @@ fn decode_gif(buffer: &[u8], cors_status: CorsStatus) -> Option<Image> {
// This uses `map_while`, because the first non-decodable frame seems to
// send the frame iterator into an infinite loop. See
// <https://github.com/image-rs/image/issues/2442>.
+ let mut frame_data = vec![];
+ let mut total_number_of_bytes = 0;
let frames: Vec<ImageFrame> = decoded_gif
.into_frames()
.map_while(|decoded_frame| {
- let mut frame = match decoded_frame {
+ let mut gif_frame = match decoded_frame {
Ok(decoded_frame) => decoded_frame,
Err(error) => {
debug!("decode GIF frame error: {error}");
return None;
},
};
- rgba8_byte_swap_colors_inplace(frame.buffer_mut());
+ rgba8_byte_swap_colors_inplace(gif_frame.buffer_mut());
+ let frame_start = total_number_of_bytes;
+ total_number_of_bytes += gif_frame.buffer().len();
+
+ // The image size should be at least as large as the largest frame.
+ let frame_width = gif_frame.buffer().width();
+ let frame_height = gif_frame.buffer().height();
+ width = cmp::max(width, frame_width);
+ height = cmp::max(height, frame_height);
let frame = ImageFrame {
- bytes: IpcSharedMemory::from_bytes(frame.buffer()),
- delay: Some(Duration::from(frame.delay())),
- width: frame.buffer().width(),
- height: frame.buffer().height(),
+ byte_range: frame_start..total_number_of_bytes,
+ delay: Some(Duration::from(gif_frame.delay())),
+ width: frame_width,
+ height: frame_height,
};
- // The image size should be at least as large as the largest frame.
- width = cmp::max(width, frame.width);
- height = cmp::max(height, frame.height);
+ frame_data.push(gif_frame);
+
Some(frame)
})
.collect();
if frames.is_empty() {
debug!("Animated Image decoding error");
- None
- } else {
- Some(Image {
- width,
- height,
- cors_status,
- frames,
- id: None,
- format: PixelFormat::BGRA8,
- })
+ return None;
}
+
+ // Coalesce the frame data into one single shared memory region.
+ let mut bytes = Vec::with_capacity(total_number_of_bytes);
+ for frame in frame_data {
+ bytes.extend_from_slice(frame.buffer());
+ }
+
+ Some(Image {
+ width,
+ height,
+ cors_status,
+ frames,
+ id: None,
+ format: PixelFormat::BGRA8,
+ bytes: IpcSharedMemory::from_bytes(&bytes),
+ })
}
#[cfg(test)]
diff --git a/components/script/canvas_state.rs b/components/script/canvas_state.rs
index dabe6a5728b..d4840a5b470 100644
--- a/components/script/canvas_state.rs
+++ b/components/script/canvas_state.rs
@@ -17,7 +17,7 @@ use cssparser::color::clamp_unit_f32;
use cssparser::{Parser, ParserInput};
use euclid::default::{Point2D, Rect, Size2D, Transform2D};
use euclid::vec2;
-use ipc_channel::ipc::{self, IpcSender};
+use ipc_channel::ipc::{self, IpcSender, IpcSharedMemory};
use net_traits::image_cache::{ImageCache, ImageResponse};
use net_traits::request::CorsSettings;
use pixels::PixelFormat;
@@ -350,7 +350,7 @@ impl CanvasState {
size.cast(),
format,
alpha_mode,
- img.bytes(),
+ IpcSharedMemory::from_bytes(img.first_frame().bytes),
))
}
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 98170f9655b..b82051b3b12 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -619,7 +619,8 @@ impl WebGLRenderingContext {
let size = Size2D::new(img.width, img.height);
- TexPixels::new(img.bytes(), size, img.format, false)
+ let data = IpcSharedMemory::from_bytes(img.first_frame().bytes);
+ TexPixels::new(data, size, img.format, false)
},
// TODO(emilio): Getting canvas data is implemented in CanvasRenderingContext2D,
// but we need to refactor it moving it to `HTMLCanvasElement` and support
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
index 5735594b058..09c466cad3c 100644
--- a/components/webdriver_server/lib.rs
+++ b/components/webdriver_server/lib.rs
@@ -1709,7 +1709,8 @@ impl Handler {
"Unexpected screenshot pixel format"
);
- let rgb = RgbaImage::from_raw(img.width, img.height, img.bytes().to_vec()).unwrap();
+ let rgb =
+ RgbaImage::from_raw(img.width, img.height, img.first_frame().bytes.to_vec()).unwrap();
let mut png_data = Cursor::new(Vec::new());
DynamicImage::ImageRgba8(rgb)
.write_to(&mut png_data, ImageFormat::Png)
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 17:59:28 +0000