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

Avoid a byte swap roundtrip

Browse source
This commit is contained in:
Anthony Ramine 2018-09-14 09:14:09 +02:00
parent 93fbc1575f
commit fef04c65f6
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/canvas/canvas_data.rs
View file

@ -729,7 +729,7 @@ fn crop_image(
/// smoothing_enabled: It determines if smoothing is applied to the image result /// smoothing_enabled: It determines if smoothing is applied to the image result
fn write_image( fn write_image(
draw_target: &DrawTarget, draw_target: &DrawTarget,
mut image_data: Vec<u8>, image_data: Vec<u8>,
image_size: Size2D<f64>, image_size: Size2D<f64>,
dest_rect: Rect<f64>, dest_rect: Rect<f64>,
smoothing_enabled: bool, smoothing_enabled: bool,
@ -740,8 +740,6 @@ fn write_image(
return return
} }
let image_rect = Rect::new(Point2D::zero(), image_size); let image_rect = Rect::new(Point2D::zero(), image_size);
// rgba -> bgra
byte_swap(&mut image_data);
// From spec https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage // From spec https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage
// When scaling up, if the imageSmoothingEnabled attribute is set to true, the user agent should attempt // When scaling up, if the imageSmoothingEnabled attribute is set to true, the user agent should attempt

5
components/canvas/canvas_paint_thread.rs
View file

@ -132,12 +132,13 @@ impl<'a> CanvasPaintThread <'a> {
self.canvas(canvas_id).is_point_in_path(x, y, fill_rule, chan) self.canvas(canvas_id).is_point_in_path(x, y, fill_rule, chan)
}, },
Canvas2dMsg::DrawImage( Canvas2dMsg::DrawImage(
imagedata, mut imagedata,
image_size, image_size,
dest_rect, dest_rect,
source_rect, source_rect,
smoothing_enabled, smoothing_enabled,
) => { ) => {
byte_swap(&mut imagedata);
self.canvas(canvas_id).draw_image( self.canvas(canvas_id).draw_image(
imagedata.into(), imagedata.into(),
image_size, image_size,
@ -169,8 +170,6 @@ impl<'a> CanvasPaintThread <'a> {
let mut image_data = self.canvas(canvas_id).read_pixels( let mut image_data = self.canvas(canvas_id).read_pixels(
source_rect.to_i32(), source_rect.to_i32(),
image_size); image_size);
// TODO: avoid double byte_swap.
byte_swap(&mut image_data);
self.canvas(other_canvas_id).draw_image( self.canvas(other_canvas_id).draw_image(
image_data.into(), image_data.into(),
source_rect.size, source_rect.size,