Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use a byte channel to retrieve pixels of 2D canvas

Browse source
This commit is contained in:
Anthony Ramine 2018-09-13 16:21:57 +02:00
parent b5c469d52e
commit 2f2331f149
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/canvas/canvas_data.rs
View file

@ -11,7 +11,7 @@ use azure::azure_hl::SurfacePattern;
use canvas_traits::canvas::*; use canvas_traits::canvas::*;
use cssparser::RGBA; use cssparser::RGBA;
use euclid::{Transform2D, Point2D, Vector2D, Rect, Size2D}; use euclid::{Transform2D, Point2D, Vector2D, Rect, Size2D};
use ipc_channel::ipc::IpcSender; use ipc_channel::ipc::{IpcBytesSender, IpcSender};
use num_traits::ToPrimitive; use num_traits::ToPrimitive;
use serde_bytes::ByteBuf; use serde_bytes::ByteBuf;
use std::mem; use std::mem;
@ -456,9 +456,9 @@ impl<'a> CanvasData<'a> {
&self, &self,
dest_rect: Rect<i32>, dest_rect: Rect<i32>,
canvas_size: Size2D<f64>, canvas_size: Size2D<f64>,
chan: IpcSender<ByteBuf>, sender: IpcBytesSender,
) { ) {
chan.send(self.read_pixels(dest_rect, canvas_size).into()).unwrap(); sender.send(&self.read_pixels(dest_rect, canvas_size)).unwrap();
} }
// https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata // https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata

4
components/canvas_traits/canvas.rs
View file

@ -4,7 +4,7 @@
use cssparser::RGBA; use cssparser::RGBA;
use euclid::{Transform2D, Point2D, Vector2D, Rect, Size2D}; use euclid::{Transform2D, Point2D, Vector2D, Rect, Size2D};
use ipc_channel::ipc::IpcSender; use ipc_channel::ipc::{IpcBytesSender, IpcSender};
use serde_bytes::ByteBuf; use serde_bytes::ByteBuf;
use std::default::Default; use std::default::Default;
use std::str::FromStr; use std::str::FromStr;
@ -51,7 +51,7 @@ pub enum Canvas2dMsg {
Fill, Fill,
FillText(String, f64, f64, Option<f64>), FillText(String, f64, f64, Option<f64>),
FillRect(Rect<f32>), FillRect(Rect<f32>),
GetImageData(Rect<i32>, Size2D<f64>, IpcSender<ByteBuf>), GetImageData(Rect<i32>, Size2D<f64>, IpcBytesSender),
IsPointInPath(f64, f64, FillRule, IpcSender<bool>), IsPointInPath(f64, f64, FillRule, IpcSender<bool>),
LineTo(Point2D<f32>), LineTo(Point2D<f32>),
MoveTo(Point2D<f32>), MoveTo(Point2D<f32>),

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

@ -32,7 +32,7 @@ use dom::imagedata::ImageData;
use dom::node::{Node, NodeDamage, window_from_node}; use dom::node::{Node, NodeDamage, window_from_node};
use dom_struct::dom_struct; use dom_struct::dom_struct;
use euclid::{Transform2D, Point2D, Vector2D, Rect, Size2D, vec2}; use euclid::{Transform2D, Point2D, Vector2D, Rect, Size2D, vec2};
use ipc_channel::ipc::IpcSender; use ipc_channel::ipc::{self, IpcSender};
use net_traits::image::base::PixelFormat; use net_traits::image::base::PixelFormat;
use net_traits::image_cache::CanRequestImages; use net_traits::image_cache::CanRequestImages;
use net_traits::image_cache::ImageCache; use net_traits::image_cache::ImageCache;
@ -41,7 +41,7 @@ use net_traits::image_cache::ImageResponse;
use net_traits::image_cache::ImageState; use net_traits::image_cache::ImageState;
use net_traits::image_cache::UsePlaceholder; use net_traits::image_cache::UsePlaceholder;
use num_traits::ToPrimitive; use num_traits::ToPrimitive;
use profile_traits::ipc; use profile_traits::ipc as profiled_ipc;
use script_traits::ScriptMsg; use script_traits::ScriptMsg;
use servo_url::ServoUrl; use servo_url::ServoUrl;
use std::{cmp, fmt, mem}; use std::{cmp, fmt, mem};
@ -130,7 +130,7 @@ impl CanvasRenderingContext2D {
size: Size2D<i32>) size: Size2D<i32>)
-> CanvasRenderingContext2D { -> CanvasRenderingContext2D {
debug!("Creating new canvas rendering context."); debug!("Creating new canvas rendering context.");
let (sender, receiver) = ipc::channel(global.time_profiler_chan().clone()).unwrap(); let (sender, receiver) = profiled_ipc::channel(global.time_profiler_chan().clone()).unwrap();
let script_to_constellation_chan = global.script_to_constellation_chan(); let script_to_constellation_chan = global.script_to_constellation_chan();
debug!("Asking constellation to create new canvas thread."); debug!("Asking constellation to create new canvas thread.");
script_to_constellation_chan.send(ScriptMsg::CreateCanvasPaintThread(size, sender)).unwrap(); script_to_constellation_chan.send(ScriptMsg::CreateCanvasPaintThread(size, sender)).unwrap();
@ -790,7 +790,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
CanvasFillRule::Nonzero => FillRule::Nonzero, CanvasFillRule::Nonzero => FillRule::Nonzero,
CanvasFillRule::Evenodd => FillRule::Evenodd, CanvasFillRule::Evenodd => FillRule::Evenodd,
}; };
let (sender, receiver) = ipc::channel::<bool>(self.global().time_profiler_chan().clone()).unwrap(); let (sender, receiver) = profiled_ipc::channel::<bool>(self.global().time_profiler_chan().clone()).unwrap();
self.send_canvas_2d_msg(Canvas2dMsg::IsPointInPath(x, y, fill_rule, sender)); self.send_canvas_2d_msg(Canvas2dMsg::IsPointInPath(x, y, fill_rule, sender));
receiver.recv().unwrap() receiver.recv().unwrap()
} }
@ -1107,7 +1107,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
let sh = cmp::max(1, sh.to_u32().unwrap()); let sh = cmp::max(1, sh.to_u32().unwrap());
let sw = cmp::max(1, sw.to_u32().unwrap()); let sw = cmp::max(1, sw.to_u32().unwrap());
let (sender, receiver) = ipc::channel(self.global().time_profiler_chan().clone()).unwrap(); let (sender, receiver) = ipc::bytes_channel().unwrap();
let dest_rect = Rect::new(Point2D::new(sx.to_i32().unwrap(), sy.to_i32().unwrap()), let dest_rect = Rect::new(Point2D::new(sx.to_i32().unwrap(), sy.to_i32().unwrap()),
Size2D::new(sw as i32, sh as i32)); Size2D::new(sw as i32, sh as i32));
let canvas_size = self.canvas.as_ref().map(|c| c.get_size()).unwrap_or(Size2D::zero()); let canvas_size = self.canvas.as_ref().map(|c| c.get_size()).unwrap_or(Size2D::zero());