From bb99b2f3c8813919c476930c709b73d3cfbc8c83 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Mon, 13 Jul 2015 17:02:35 -0700 Subject: script: Make most of 2D canvas and WebGL run over IPC. To actually make the multiprocess communication work, we'll need to reroute the task creation to the pipeline or the compositor. But this works as a first step. --- components/script/dom/webglrenderbuffer.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'components/script/dom/webglrenderbuffer.rs') diff --git a/components/script/dom/webglrenderbuffer.rs b/components/script/dom/webglrenderbuffer.rs index d7084564ec3..cfe3fb21261 100644 --- a/components/script/dom/webglrenderbuffer.rs +++ b/components/script/dom/webglrenderbuffer.rs @@ -10,7 +10,7 @@ use dom::bindings::utils::reflect_dom_object; use dom::webglobject::WebGLObject; use canvas_traits::{CanvasMsg, CanvasWebGLMsg}; -use std::sync::mpsc::{channel, Sender}; +use ipc_channel::ipc::{self, IpcSender}; use std::cell::Cell; #[dom_struct] @@ -18,11 +18,11 @@ pub struct WebGLRenderbuffer { webgl_object: WebGLObject, id: u32, is_deleted: Cell, - renderer: Sender, + renderer: IpcSender, } impl WebGLRenderbuffer { - fn new_inherited(renderer: Sender, id: u32) -> WebGLRenderbuffer { + fn new_inherited(renderer: IpcSender, id: u32) -> WebGLRenderbuffer { WebGLRenderbuffer { webgl_object: WebGLObject::new_inherited(), id: id, @@ -31,15 +31,17 @@ impl WebGLRenderbuffer { } } - pub fn maybe_new(global: GlobalRef, renderer: Sender) -> Option> { - let (sender, receiver) = channel(); + pub fn maybe_new(global: GlobalRef, renderer: IpcSender) + -> Option> { + let (sender, receiver) = ipc::channel().unwrap(); renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::CreateRenderbuffer(sender))).unwrap(); let result = receiver.recv().unwrap(); result.map(|renderbuffer_id| WebGLRenderbuffer::new(global, renderer, *renderbuffer_id)) } - pub fn new(global: GlobalRef, renderer: Sender, id: u32) -> Root { + pub fn new(global: GlobalRef, renderer: IpcSender, id: u32) + -> Root { reflect_dom_object(box WebGLRenderbuffer::new_inherited(renderer, id), global, WebGLRenderbufferBinding::Wrap) } } -- cgit v1.2.3