From 6a1f7a717d9e773a1fd287e98101c0082e5521fe Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Wed, 4 Jan 2017 12:19:06 +0100
Subject: [PATCH] Move LayerPixel to compositing.

---
 components/compositing/compositor.rs | 9 ++++++++-
 components/gfx_traits/lib.rs         | 7 -------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index e0d11574e0c2..d852ae728f17 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -11,7 +11,7 @@ use euclid::Point2D;
 use euclid::point::TypedPoint2D;
 use euclid::scale_factor::ScaleFactor;
 use euclid::size::TypedSize2D;
-use gfx_traits::{DevicePixel, LayerPixel, ScrollRootId};
+use gfx_traits::{DevicePixel, ScrollRootId};
 use gfx_traits::{Epoch, FragmentType};
 use gleam::gl;
 use gleam::gl::types::{GLint, GLsizei};
@@ -117,6 +117,13 @@ impl FrameTreeId {
     }
 }
 
+/// One pixel in layer coordinate space.
+///
+/// This unit corresponds to a "pixel" in layer coordinate space, which after scaling and
+/// transformation becomes a device pixel.
+#[derive(Copy, Clone, Debug)]
+enum LayerPixel {}
+
 /// NB: Never block on the constellation, because sometimes the constellation blocks on us.
 pub struct IOCompositor<Window: WindowMethods> {
     /// The application window.
diff --git a/components/gfx_traits/lib.rs b/components/gfx_traits/lib.rs
index c2339f655d95..fbed979bc39c 100644
--- a/components/gfx_traits/lib.rs
+++ b/components/gfx_traits/lib.rs
@@ -44,13 +44,6 @@ const SPECIAL_STACKING_CONTEXT_ID_MASK: usize = 0xffff;
 #[derive(Copy, Clone, RustcEncodable, Debug)]
 pub enum DevicePixel {}
 
-/// One pixel in layer coordinate space.
-///
-/// This unit corresponds to a "pixel" in layer coordinate space, which after scaling and
-/// transformation becomes a device pixel.
-#[derive(Copy, Clone, RustcEncodable, Debug)]
-pub enum LayerPixel {}
-
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum LayerKind {
     NoTransform,