Revert "Auto merge of #17891 - MortimerGoro:webgl_move, r=glennw,emilio"

This reverts commit 90f55ea4580e2a15f7d70d0491444f18b972d450, reversing
changes made to 2e60b27a2186a8cba4b952960155dfcf3f47d7db.

1 files changed, 4 insertions, 15 deletions

diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 2da650ee1ee..90693a2ccbf 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -5,7 +5,6 @@
 use app_units::Au;
 use base64;
 use bluetooth_traits::BluetoothRequest;
-use canvas_traits::webgl::WebGLChan;
 use cssparser::{Parser, ParserInput};
 use devtools_traits::{ScriptToDevtoolsControlMsg, TimelineMarker, TimelineMarkerType};
 use dom::bindings::cell::DOMRefCell;
@@ -265,11 +264,7 @@ pub struct Window {
 
     /// A handle for communicating messages to the webvr thread, if available.
     #[ignore_heap_size_of = "channels are hard"]
-    webgl_chan: WebGLChan,
-
-    /// A handle for communicating messages to the webvr thread, if available.
-    #[ignore_heap_size_of = "channels are hard"]
-    webvr_chan: Option<IpcSender<WebVRMsg>>,
+    webvr_thread: Option<IpcSender<WebVRMsg>>,
 
     /// A map for storing the previous permission state read results.
     permission_state_invocation_results: DOMRefCell<HashMap<String, PermissionState>>,
@@ -385,12 +380,8 @@ impl Window {
         self.current_viewport.clone().get()
     }
 
-    pub fn webgl_chan(&self) -> WebGLChan {
-        self.webgl_chan.clone()
-    }
-
     pub fn webvr_thread(&self) -> Option<IpcSender<WebVRMsg>> {
-        self.webvr_chan.clone()
+        self.webvr_thread.clone()
     }
 
     fn new_paint_worklet(&self) -> Root<Worklet> {
@@ -1809,8 +1800,7 @@ impl Window {
                origin: MutableOrigin,
                navigation_start: u64,
                navigation_start_precise: f64,
-               webgl_chan: WebGLChan,
-               webvr_chan: Option<IpcSender<WebVRMsg>>)
+               webvr_thread: Option<IpcSender<WebVRMsg>>)
                -> Root<Window> {
         let layout_rpc: Box<LayoutRPC + Send> = {
             let (rpc_send, rpc_recv) = channel();
@@ -1876,8 +1866,7 @@ impl Window {
             scroll_offsets: DOMRefCell::new(HashMap::new()),
             media_query_lists: WeakMediaQueryListVec::new(),
             test_runner: Default::default(),
-            webgl_chan: webgl_chan,
-            webvr_chan: webvr_chan,
+            webvr_thread: webvr_thread,
             permission_state_invocation_results: DOMRefCell::new(HashMap::new()),
             pending_layout_images: DOMRefCell::new(HashMap::new()),
             unminified_js_dir: DOMRefCell::new(None),