Remove layers dependency from util

8 files changed, 4 insertions, 13 deletions

diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index db014d7f9a2..ace2a499b66 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -1055,7 +1055,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
 
     fn device_pixels_per_screen_px(&self) -> ScaleFactor<ScreenPx, DevicePixel, f32> {
         match opts::get().device_pixels_per_px {
-            Some(device_pixels_per_px) => device_pixels_per_px,
+            Some(device_pixels_per_px) => ScaleFactor::new(device_pixels_per_px),
             None => match opts::get().output_file {
                 Some(_) => ScaleFactor::new(1.0),
                 None => self.hidpi_factor
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 8b972d2b2ba..cccc17f61a1 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -1304,7 +1304,6 @@ dependencies = [
  "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml
index 674344a7ac6..f794fb7ce13 100644
--- a/components/util/Cargo.toml
+++ b/components/util/Cargo.toml
@@ -24,9 +24,6 @@ git = "https://github.com/servo/rust-selectors"
 [dependencies.azure]
 git = "https://github.com/servo/rust-azure"
 
-[dependencies.layers]
-git = "https://github.com/servo/rust-layers"
-
 [dependencies]
 log = "*"
 bitflags = "*"
diff --git a/components/util/lib.rs b/components/util/lib.rs
index 8dcd3d6cad0..d15755cc4b2 100644
--- a/components/util/lib.rs
+++ b/components/util/lib.rs
@@ -28,7 +28,6 @@ extern crate alloc;
 #[macro_use] extern crate cssparser;
 extern crate euclid;
 extern crate getopts;
-extern crate layers;
 extern crate libc;
 extern crate num as num_lib;
 extern crate num_cpus;
diff --git a/components/util/opts.rs b/components/util/opts.rs
index 27d6f327dbb..de7e1a9e2ee 100644
--- a/components/util/opts.rs
+++ b/components/util/opts.rs
@@ -7,9 +7,7 @@
 
 use geometry::ScreenPx;
 
-use euclid::scale_factor::ScaleFactor;
 use euclid::size::{Size2D, TypedSize2D};
-use layers::geometry::DevicePixel;
 use getopts;
 use num_cpus;
 use std::collections::HashSet;
@@ -44,7 +42,7 @@ pub struct Opts {
 
     /// The ratio of device pixels per px at the default scale. If unspecified, will use the
     /// platform default setting.
-    pub device_pixels_per_px: Option<ScaleFactor<ScreenPx, DevicePixel, f32>>,
+    pub device_pixels_per_px: Option<f32>,
 
     /// `None` to disable the time profiler or `Some` with an interval in seconds to enable it and
     /// cause it to produce output on that interval (`-p`).
@@ -328,7 +326,7 @@ pub fn from_cmdline_args(args: &[String]) {
     };
 
     let device_pixels_per_px = opt_match.opt_str("device-pixel-ratio").map(|dppx_str|
-        ScaleFactor::new(dppx_str.parse().unwrap())
+        dppx_str.parse().unwrap()
     );
 
     let mut paint_threads: usize = match opt_match.opt_str("t") {
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index db08ea9319d..953b6721242 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -1288,7 +1288,6 @@ dependencies = [
  "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/glutin/lib.rs b/ports/glutin/lib.rs
index 727500e6418..b243ec6ff49 100644
--- a/ports/glutin/lib.rs
+++ b/ports/glutin/lib.rs
@@ -41,7 +41,7 @@ pub fn create_window(parent: WindowID) -> Rc<Window> {
     // Read command-line options.
     let opts = opts::get();
     let foreground = opts.output_file.is_none();
-    let scale_factor = opts.device_pixels_per_px.unwrap_or(ScaleFactor::new(1.0));
+    let scale_factor = ScaleFactor::new(opts.device_pixels_per_px.unwrap_or(1.0));
     let size = opts.initial_window_size.as_f32() * scale_factor;
 
     // Open a window.
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index f7fe0960f33..1b8013c0447 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -1177,7 +1177,6 @@ dependencies = [
  "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",