From cfe22e3979b7270833a4b450b25fb2157deb1da2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 16 Aug 2017 16:42:13 +0200
Subject: Revert "Auto merge of #17891 - MortimerGoro:webgl_move,
 r=glennw,emilio"

This reverts commit 90f55ea4580e2a15f7d70d0491444f18b972d450, reversing
changes made to 2e60b27a2186a8cba4b952960155dfcf3f47d7db.
---
 components/script_layout_interface/lib.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'components/script_layout_interface/lib.rs')

diff --git a/components/script_layout_interface/lib.rs b/components/script_layout_interface/lib.rs
index 7c0f97ef917..e3e956096bb 100644
--- a/components/script_layout_interface/lib.rs
+++ b/components/script_layout_interface/lib.rs
@@ -43,7 +43,7 @@ pub mod rpc;
 pub mod wrapper_traits;
 
 use atomic_refcell::AtomicRefCell;
-use canvas_traits::canvas::CanvasMsg;
+use canvas_traits::CanvasMsg;
 use core::nonzero::NonZero;
 use ipc_channel::ipc::IpcSender;
 use libc::c_void;
@@ -124,13 +124,8 @@ pub enum LayoutElementType {
     SVGSVGElement,
 }
 
-pub enum HTMLCanvasDataSource {
-    WebGL(webrender_api::ImageKey),
-    Image(Option<IpcSender<CanvasMsg>>)
-}
-
 pub struct HTMLCanvasData {
-    pub source: HTMLCanvasDataSource,
+    pub ipc_renderer: Option<IpcSender<CanvasMsg>>,
     pub width: u32,
     pub height: u32,
 }
-- 
cgit v1.2.3