2 files changed, 29 insertions, 10 deletions
diff --git a/components/canvas/canvas_paint_thread.rs b/components/canvas/canvas_paint_thread.rs
index b87470f53c6..26863482a99 100644
--- a/components/canvas/canvas_paint_thread.rs
+++ b/components/canvas/canvas_paint_thread.rs
@@ -12,7 +12,6 @@ use euclid::point::Point2D;
 use euclid::rect::Rect;
 use euclid::size::Size2D;
 use ipc_channel::ipc::{self, IpcSender};
-use ipc_channel::ipc::IpcSharedMemory;
 use num_traits::ToPrimitive;
 use std::borrow::ToOwned;
 use std::mem;
@@ -195,6 +194,13 @@ impl<'a> CanvasPaintThread<'a> {
                             CanvasCommonMsg::Recreate(size) => painter.recreate(size),
                         }
                     },
+                    CanvasMsg::FromScript(message) => {
+                        match message {
+                            FromScriptMsg::SendPixels(chan) => {
+                                painter.send_pixels(chan)
+                            }
+                        }
+                    }
                     CanvasMsg::FromLayout(message) => {
                         match message {
                             FromLayoutMsg::SendData(chan) => {
@@ -539,6 +545,12 @@ impl<'a> CanvasPaintThread<'a> {
         self.drawtarget = CanvasPaintThread::create(size);
     }
 
+    fn send_pixels(&mut self, chan: IpcSender<Option<Vec<u8>>>) {
+        self.drawtarget.snapshot().get_data_surface().with_data(|element| {
+            chan.send(Some(element.into())).unwrap();
+        })
+    }
+
     fn send_data(&mut self, chan: IpcSender<CanvasData>) {
         self.drawtarget.snapshot().get_data_surface().with_data(|element| {
             let size = self.drawtarget.get_size();
@@ -548,11 +560,10 @@ impl<'a> CanvasPaintThread<'a> {
                                             webrender_traits::ImageFormat::RGBA8,
                                             element.into());
 
-            let pixel_data = CanvasPixelData {
-                image_data: IpcSharedMemory::from_bytes(element),
+            let data = CanvasImageData {
                 image_key: self.webrender_image_key,
             };
-            chan.send(CanvasData::Pixels(pixel_data)).unwrap();
+            chan.send(CanvasData::Image(data)).unwrap();
         })
     }
 
diff --git a/components/canvas/webgl_paint_thread.rs b/components/canvas/webgl_paint_thread.rs
index 88ab2080a81..13a69718f2d 100644
--- a/components/canvas/webgl_paint_thread.rs
+++ b/components/canvas/webgl_paint_thread.rs
@@ -2,11 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use canvas_traits::{CanvasCommonMsg, CanvasData, CanvasMsg, CanvasPixelData};
-use canvas_traits::{FromLayoutMsg, byte_swap};
+use canvas_traits::{CanvasCommonMsg, CanvasData, CanvasMsg, CanvasImageData};
+use canvas_traits::{FromLayoutMsg, FromScriptMsg, byte_swap};
 use euclid::size::Size2D;
 use gleam::gl;
-use ipc_channel::ipc::{self, IpcSender, IpcSharedMemory};
+use ipc_channel::ipc::{self, IpcSender};
 use offscreen_gl_context::{ColorAttachmentType, GLContext, GLLimits};
 use offscreen_gl_context::{GLContextAttributes, NativeGLContext, OSMesaContext};
 use std::borrow::ToOwned;
@@ -173,6 +173,15 @@ impl WebGLPaintThread {
                             CanvasCommonMsg::Recreate(size) => painter.recreate(size).unwrap(),
                         }
                     },
+                    CanvasMsg::FromScript(message) => {
+                        match message {
+                            FromScriptMsg::SendPixels(chan) =>{
+                                // Read the comment on
+                                // HTMLCanvasElement::fetch_all_data.
+                                chan.send(None).unwrap();
+                            }
+                        }
+                    }
                     CanvasMsg::FromLayout(message) => {
                         match message {
                             FromLayoutMsg::SendData(chan) =>
@@ -218,12 +227,11 @@ impl WebGLPaintThread {
                                            webrender_traits::ImageFormat::RGBA8,
                                            pixels.clone());
 
-                let pixel_data = CanvasPixelData {
-                    image_data: IpcSharedMemory::from_bytes(&pixels[..]),
+                let image_data = CanvasImageData {
                     image_key: image_key,
                 };
 
-                chan.send(CanvasData::Pixels(pixel_data)).unwrap();
+                chan.send(CanvasData::Image(image_data)).unwrap();
             }
             WebGLPaintTaskData::WebRender(_, id) => {
                 chan.send(CanvasData::WebGL(id)).unwrap();