mirror of
https://github.com/servo/servo.git
synced 2025-07-19 13:23:46 +01:00
canvas: Add initial support of ImageBitmapRenderingContext (#37998)
Add support of the ImageBitmapRenderingContext as "bitmaprenderer" canvas context mode to RenderingContext/OffscreenRenderingContext https://html.spec.whatwg.org/multipage/#imagebitmaprenderingcontext It is initial implementation with public interface API but without any display presentation support for HTMLCanvasElement. Testing: Improvements in the following tests: - html/canvas/element/manual/imagebitmap/createImageBitmap-origin.sub.html - html/canvas/offscreen/manual/text/canvas.2d.offscreen* - html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.nocrash.html - imagebitmap-renderingcontext/* Signed-off-by: Andrei Volykhin <andrei.volykhin@gmail.com>
This commit is contained in:
parent
ccc902eb7a
commit
c817d7b9ce
20 changed files with 365 additions and 82 deletions
|
@ -36,7 +36,7 @@ use style_traits::{CssWriter, ParsingMode};
|
|||
use url::Url;
|
||||
use webrender_api::ImageKey;
|
||||
|
||||
use crate::canvas_context::{OffscreenRenderingContext, RenderingContext};
|
||||
use crate::canvas_context::{CanvasContext, OffscreenRenderingContext, RenderingContext};
|
||||
use crate::dom::bindings::cell::DomRefCell;
|
||||
use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::{
|
||||
CanvasDirection, CanvasFillRule, CanvasImageSource, CanvasLineCap, CanvasLineJoin,
|
||||
|
@ -623,7 +623,10 @@ impl CanvasState {
|
|||
dw: Option<f64>,
|
||||
dh: Option<f64>,
|
||||
) -> ErrorResult {
|
||||
let canvas_size = canvas.get_size();
|
||||
let canvas_size = canvas
|
||||
.context()
|
||||
.map_or_else(|| canvas.get_size(), |context| context.size());
|
||||
|
||||
let dw = dw.unwrap_or(canvas_size.width as f64);
|
||||
let dh = dh.unwrap_or(canvas_size.height as f64);
|
||||
let sw = sw.unwrap_or(canvas_size.width as f64);
|
||||
|
@ -651,6 +654,18 @@ impl CanvasState {
|
|||
smoothing_enabled,
|
||||
));
|
||||
},
|
||||
OffscreenRenderingContext::BitmapRenderer(ref context) => {
|
||||
let Some(snapshot) = context.get_image_data() else {
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
self.send_canvas_2d_msg(Canvas2dMsg::DrawImage(
|
||||
snapshot.as_ipc(),
|
||||
dest_rect,
|
||||
source_rect,
|
||||
smoothing_enabled,
|
||||
));
|
||||
},
|
||||
OffscreenRenderingContext::Detached => return Err(Error::InvalidState),
|
||||
}
|
||||
} else {
|
||||
|
@ -679,7 +694,10 @@ impl CanvasState {
|
|||
dw: Option<f64>,
|
||||
dh: Option<f64>,
|
||||
) -> ErrorResult {
|
||||
let canvas_size = canvas.get_size();
|
||||
let canvas_size = canvas
|
||||
.context()
|
||||
.map_or_else(|| canvas.get_size(), |context| context.size());
|
||||
|
||||
let dw = dw.unwrap_or(canvas_size.width as f64);
|
||||
let dh = dh.unwrap_or(canvas_size.height as f64);
|
||||
let sw = sw.unwrap_or(canvas_size.width as f64);
|
||||
|
@ -707,6 +725,18 @@ impl CanvasState {
|
|||
smoothing_enabled,
|
||||
));
|
||||
},
|
||||
RenderingContext::BitmapRenderer(ref context) => {
|
||||
let Some(snapshot) = context.get_image_data() else {
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
self.send_canvas_2d_msg(Canvas2dMsg::DrawImage(
|
||||
snapshot.as_ipc(),
|
||||
dest_rect,
|
||||
source_rect,
|
||||
smoothing_enabled,
|
||||
));
|
||||
},
|
||||
RenderingContext::Placeholder(ref context) => {
|
||||
let Some(context) = context.context() else {
|
||||
return Err(Error::InvalidState);
|
||||
|
@ -720,6 +750,18 @@ impl CanvasState {
|
|||
source_rect,
|
||||
smoothing_enabled,
|
||||
)),
|
||||
OffscreenRenderingContext::BitmapRenderer(ref context) => {
|
||||
let Some(snapshot) = context.get_image_data() else {
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
self.send_canvas_2d_msg(Canvas2dMsg::DrawImage(
|
||||
snapshot.as_ipc(),
|
||||
dest_rect,
|
||||
source_rect,
|
||||
smoothing_enabled,
|
||||
));
|
||||
},
|
||||
OffscreenRenderingContext::Detached => return Err(Error::InvalidState),
|
||||
}
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue