auto merge of #4798 : glennw/servo/remove-glfw, r=SimonSapin

servo · Feb 2, 2015 · 896cdcb · 896cdcb
2 parents ccdf0bd + f495884
commit 896cdcb
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 744 deletions.
diff --git a/components/compositing/platform/mod.rs b/components/compositing/platform/mod.rs
diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs
@@ -59,7 +59,7 @@ pub enum KeyState {
     Repeated,
 }
 
-//N.B. Straight up copied from glfw-rs
+//N.B. Based on the glutin key enum
 #[derive(Show, PartialEq, Eq, Copy, Clone)]
 pub enum Key {
     Space,

diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
@@ -30,8 +30,7 @@ path = "../../tests/contenttest.rs"
 harness = false
 
 [features]
-default = ["glutin_app", "window"]
-glfw = ["glfw_app"]
+default = ["window"]
 window = ["glutin_app/window"]
 headless = ["glutin_app/headless"]
 
@@ -59,13 +58,8 @@ path = "../gfx"
 [dependencies.devtools]
 path = "../devtools"
 
-[dependencies.glfw_app]
-path = "../../ports/glfw"
-optional = true
-
 [dependencies.glutin_app]
 path = "../../ports/glutin"
-optional = true
 
 [dependencies.android_glue]
 path = "../../support/android-rs-glue/glue"

diff --git a/components/servo/main.rs b/components/servo/main.rs
@@ -13,10 +13,8 @@ extern crate servo;
 extern crate time;
 extern crate util;
 
-#[cfg(all(feature = "glutin_app",not(test)))]
+#[cfg(not(test))]
 extern crate "glutin_app" as app;
-#[cfg(all(feature = "glfw",not(test)))]
-extern crate "glfw_app" as app;
 
 #[cfg(not(test))]
 extern crate compositing;

diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
diff --git a/ports/cef/window.rs b/ports/cef/window.rs
@@ -5,7 +5,7 @@
 //! Off-screen windows.
 //!
 //! This is used for off-screen rendering mode only; on-screen windows (the default embedding mode)
-//! are managed by a platform toolkit (GLFW or Glutin).
+//! are managed by a platform toolkit (Glutin).
 
 use eutil::Downcast;
 use interfaces::CefBrowser;

diff --git a/ports/glfw/Cargo.toml b/ports/glfw/Cargo.toml
diff --git a/ports/glfw/lib.rs b/ports/glfw/lib.rs