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

Remove Snapshot::from_shared_memory to avoid double allocation (#37562)

Browse source 
It was always misused, causing extra allocations all over the place.
Discovered in
https://github.com/servo/servo/pull/37560#discussion_r2157222917

Testing: WPT tests

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
sagudev 2025-06-20 04:09:09 +02:00 • committed by GitHub
parent a97cde0a6f
commit 7d1d50f703
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/globalscope.rs
View file

@ -32,7 +32,7 @@ use embedder_traits::EmbedderMsg;
use euclid::default::Size2D;
use http::HeaderMap;
use hyper_serde::Serde;
use ipc_channel::ipc::{self, IpcSender, IpcSharedMemory};
use ipc_channel::ipc::{self, IpcSender};
use ipc_channel::router::ROUTER;
use js::glue::{IsWrapper, UnwrapObjectDynamic};
use js::jsapi::{
@ -3069,11 +3069,11 @@ impl GlobalScope {
premultiplied: false,
};
let snapshot = Snapshot::from_shared_memory(
let snapshot = Snapshot::from_vec(
size.cast(),
format,
alpha_mode,
IpcSharedMemory::from_bytes(img.first_frame().bytes),
img.first_frame().bytes.to_vec(),
);
// Step 6.3. Set imageBitmap's bitmap data to a copy of image's media data,
@ -3244,11 +3244,11 @@ impl GlobalScope {
premultiplied: false,
};
let snapshot = Snapshot::from_shared_memory(
let snapshot = Snapshot::from_vec(
image_data.get_size().cast(),
snapshot::PixelFormat::RGBA,
alpha_mode,
image_data.to_shared_memory(),
image_data.to_vec(),
);
// Step 6.3. Set imageBitmap's bitmap data to image's image data,

6
components/script/dom/imagedata.rs
View file

@ -183,6 +183,12 @@ impl ImageData {
let ptr: *const [u8] = internal_data.as_slice() as *const _;
&*ptr
}
#[allow(unsafe_code)]
pub(crate) fn to_vec(&self) -> Vec<u8> {
// This is safe because we copy the slice content
unsafe { self.as_slice() }.to_vec()
}
}
impl ImageDataMethods<crate::DomTypeHolder> for ImageData {