diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index e0d11574e0c..d852ae728f1 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 { /// The application window. diff --git a/components/gfx_traits/lib.rs b/components/gfx_traits/lib.rs index c2339f655d9..fbed979bc39 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,