From faee0b2b0c5c5b6c696c83a1ddb03c1d4ba32e21 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Mon, 19 Nov 2018 10:19:22 +0100
Subject: [PATCH] Rename gleam feature to gl in compositing

---
 components/compositing/Cargo.toml    |  1 +
 components/compositing/compositor.rs | 18 +++++++++---------
 components/compositing/lib.rs        |  2 +-
 components/compositing/windowing.rs  |  6 +++---
 components/servo/Cargo.toml          |  2 +-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index d20ee89b354..8dbdcd56a86 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -13,6 +13,7 @@ path = "lib.rs"
 
 [features]
 default = []
+gl = ["gleam"]
 
 [dependencies]
 crossbeam-channel = "0.3"
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index 98d78c724ea..f63f56c624c 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -4,7 +4,7 @@
 
 use crate::compositor_thread::{CompositorProxy, CompositorReceiver};
 use crate::compositor_thread::{InitialCompositorState, Msg};
-#[cfg(feature = "gleam")]
+#[cfg(feature = "gl")]
 use crate::gl;
 use crate::touch::{TouchAction, TouchHandler};
 use crate::windowing::{
@@ -15,13 +15,13 @@ use crate::SendableFrameTree;
 use crossbeam_channel::Sender;
 use euclid::{TypedPoint2D, TypedScale, TypedVector2D};
 use gfx_traits::Epoch;
-#[cfg(feature = "gleam")]
+#[cfg(feature = "gl")]
 use image::{DynamicImage, ImageFormat};
 use ipc_channel::ipc;
 use libc::c_void;
 use msg::constellation_msg::{PipelineId, PipelineIndex, PipelineNamespaceId};
 use net_traits::image::base::Image;
-#[cfg(feature = "gleam")]
+#[cfg(feature = "gl")]
 use net_traits::image::base::PixelFormat;
 use profile_traits::time::{self as profile_time, profile, ProfilerCategory};
 use script_traits::CompositorEvent::{MouseButtonEvent, MouseMoveEvent, TouchEvent};
@@ -1211,13 +1211,13 @@ impl<Window: WindowMethods> IOCompositor<Window> {
         }
 
         let rt_info = match target {
-            #[cfg(feature = "gleam")]
+            #[cfg(feature = "gl")]
             CompositeTarget::Window => gl::RenderTargetInfo::default(),
-            #[cfg(feature = "gleam")]
+            #[cfg(feature = "gl")]
             CompositeTarget::WindowAndPng | CompositeTarget::PngFile => {
                 gl::initialize_png(&*self.window.gl(), width, height)
             },
-            #[cfg(not(feature = "gleam"))]
+            #[cfg(not(feature = "gl"))]
             _ => (),
         };
 
@@ -1272,7 +1272,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
 
         let rv = match target {
             CompositeTarget::Window => None,
-            #[cfg(feature = "gleam")]
+            #[cfg(feature = "gl")]
             CompositeTarget::WindowAndPng => {
                 let img = gl::draw_img(&*self.window.gl(), rt_info, width, height);
                 Some(Image {
@@ -1283,7 +1283,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
                     id: None,
                 })
             },
-            #[cfg(feature = "gleam")]
+            #[cfg(feature = "gl")]
             CompositeTarget::PngFile => {
                 let gl = &*self.window.gl();
                 profile(
@@ -1307,7 +1307,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
                 );
                 None
             },
-            #[cfg(not(feature = "gleam"))]
+            #[cfg(not(feature = "gl"))]
             _ => None,
         };
 
diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs
index 6437e18d625..8715b52eb10 100644
--- a/components/compositing/lib.rs
+++ b/components/compositing/lib.rs
@@ -20,7 +20,7 @@ use style_traits::CSSPixel;
 
 mod compositor;
 pub mod compositor_thread;
-#[cfg(feature = "gleam")]
+#[cfg(feature = "gl")]
 mod gl;
 mod touch;
 pub mod windowing;
diff --git a/components/compositing/windowing.rs b/components/compositing/windowing.rs
index 8e0b215baed..1356902b8fc 100644
--- a/components/compositing/windowing.rs
+++ b/components/compositing/windowing.rs
@@ -6,7 +6,7 @@
 
 use embedder_traits::EventLoopWaker;
 use euclid::TypedScale;
-#[cfg(feature = "gleam")]
+#[cfg(feature = "gl")]
 use gleam::gl;
 use keyboard_types::KeyboardEvent;
 use msg::constellation_msg::{TopLevelBrowsingContextId, TraversalDirection};
@@ -14,7 +14,7 @@ use script_traits::{MouseButton, TouchEventType, TouchId};
 use servo_geometry::DeviceIndependentPixel;
 use servo_url::ServoUrl;
 use std::fmt::{Debug, Error, Formatter};
-#[cfg(feature = "gleam")]
+#[cfg(feature = "gl")]
 use std::rc::Rc;
 use style_traits::DevicePixel;
 use webrender_api::{DeviceIntPoint, DevicePoint, DeviceUintRect, DeviceUintSize, ScrollLocation};
@@ -131,7 +131,7 @@ pub trait WindowMethods {
     /// proceed and false if it should not.
     fn prepare_for_composite(&self) -> bool;
     /// Return the GL function pointer trait.
-    #[cfg(feature = "gleam")]
+    #[cfg(feature = "gl")]
     fn gl(&self) -> Rc<dyn gl::Gl>;
     /// Returns a thread-safe object to wake up the window's event loop.
     fn create_event_loop_waker(&self) -> Box<dyn EventLoopWaker>;
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 8a04e9378f3..3978634743f 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -38,7 +38,7 @@ bluetooth_traits = {path = "../bluetooth_traits"}
 bluetooth = {path = "../bluetooth"}
 canvas = {path = "../canvas"}
 canvas_traits = {path = "../canvas_traits"}
-compositing = {path = "../compositing", features = ["gleam"]}
+compositing = {path = "../compositing", features = ["gl"]}
 constellation = {path = "../constellation"}
 crossbeam-channel = "0.3"
 debugger = {path = "../debugger"}