mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Make HTMLCanvasElement::fetch_all_data return a shared memory blob
This commit is contained in:
parent
804d964b7d
commit
9a8d03a0f3
5 changed files with 21 additions and 23 deletions
|
@ -1296,7 +1296,11 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
|
|||
.ok_or(Error::InvalidState)?
|
||||
},
|
||||
CanvasImageSource::HTMLCanvasElement(ref canvas) => {
|
||||
canvas.fetch_all_data().ok_or(Error::InvalidState)?
|
||||
let (data, size) = canvas.fetch_all_data().ok_or(Error::InvalidState)?;
|
||||
let data = data
|
||||
.map(|data| data.to_vec())
|
||||
.unwrap_or_else(|| vec![0; size.area() as usize * 4]);
|
||||
(data, size)
|
||||
},
|
||||
CanvasImageSource::CSSStyleValue(ref value) => value
|
||||
.get_url(self.base_url.clone())
|
||||
|
|
|
@ -36,6 +36,7 @@ use euclid::{Rect, Size2D};
|
|||
use html5ever::{LocalName, Prefix};
|
||||
use image::png::PNGEncoder;
|
||||
use image::ColorType;
|
||||
use ipc_channel::ipc::IpcSharedMemory;
|
||||
use js::error::throw_type_error;
|
||||
use js::jsapi::JSContext;
|
||||
use js::rust::HandleValue;
|
||||
|
@ -280,7 +281,7 @@ impl HTMLCanvasElement {
|
|||
self.Height() != 0 && self.Width() != 0
|
||||
}
|
||||
|
||||
pub fn fetch_all_data(&self) -> Option<(Vec<u8>, Size2D<u32>)> {
|
||||
pub fn fetch_all_data(&self) -> Option<(Option<IpcSharedMemory>, Size2D<u32>)> {
|
||||
let size = self.get_size();
|
||||
|
||||
if size.width == 0 || size.height == 0 {
|
||||
|
@ -297,7 +298,7 @@ impl HTMLCanvasElement {
|
|||
);
|
||||
context.get_ipc_renderer().send(msg).unwrap();
|
||||
|
||||
receiver.recv().unwrap()?.into()
|
||||
Some(receiver.recv().unwrap())
|
||||
},
|
||||
Some(&CanvasContext::WebGL(_)) => {
|
||||
// TODO: add a method in WebGLRenderingContext to get the pixels.
|
||||
|
@ -307,7 +308,7 @@ impl HTMLCanvasElement {
|
|||
// TODO: add a method in WebGL2RenderingContext to get the pixels.
|
||||
return None;
|
||||
},
|
||||
None => vec![0; size.height as usize * size.width as usize * 4],
|
||||
None => None,
|
||||
};
|
||||
|
||||
Some((data, size))
|
||||
|
|
|
@ -569,12 +569,10 @@ impl WebGLRenderingContext {
|
|||
return Err(Error::Security);
|
||||
}
|
||||
if let Some((data, size)) = canvas.fetch_all_data() {
|
||||
TexPixels::new(
|
||||
IpcSharedMemory::from_bytes(&data),
|
||||
size,
|
||||
PixelFormat::BGRA8,
|
||||
true,
|
||||
)
|
||||
let data = data.unwrap_or_else(|| {
|
||||
IpcSharedMemory::from_bytes(&vec![0; size.area() as usize * 4])
|
||||
});
|
||||
TexPixels::new(data, size, PixelFormat::BGRA8, true)
|
||||
} else {
|
||||
return Ok(None);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue