Make gleam optional for compositor, switch various names from glutin to winit

1 files changed, 3 insertions, 0 deletions

diff --git a/components/compositing/windowing.rs b/components/compositing/windowing.rs
index 4bfe455ab5b..11143e5eaa9 100644
--- a/components/compositing/windowing.rs
+++ b/components/compositing/windowing.rs
@@ -6,6 +6,7 @@
 
 use compositor_thread::EventLoopWaker;
 use euclid::TypedScale;
+#[cfg(feature = "gleam")]
 use gleam::gl;
 use ipc_channel::ipc::IpcSender;
 use msg::constellation_msg::{Key, KeyModifiers, KeyState, TopLevelBrowsingContextId, TraversalDirection};
@@ -13,6 +14,7 @@ use script_traits::{MouseButton, TouchEventType, TouchId};
 use servo_geometry::{DeviceIndependentPixel, DeviceUintLength};
 use servo_url::ServoUrl;
 use std::fmt::{Debug, Error, Formatter};
+#[cfg(feature = "gleam")]
 use std::rc::Rc;
 use style_traits::DevicePixel;
 use webrender_api::{DeviceIntPoint, DevicePoint, DeviceUintSize, DeviceUintRect, ScrollLocation};
@@ -126,6 +128,7 @@ pub trait WindowMethods {
     /// proceed and false if it should not.
     fn prepare_for_composite(&self, width: DeviceUintLength, height: DeviceUintLength) -> bool;
     /// Return the GL function pointer trait.
+    #[cfg(feature = "gleam")]
     fn gl(&self) -> Rc<gl::Gl>;
     /// Returns a thread-safe object to wake up the window's event loop.
     fn create_event_loop_waker(&self) -> Box<EventLoopWaker>;