diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-11 09:19:23 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-11 09:19:23 +0530 |
| commit | e89dd05a169aa16267bdb2dbfe5bca01ad6cfe84 (patch) | |
| tree | b1642a324e1b5cc5182597876717573e36fbf950 /components/script/layout_interface.rs | |
| parent | 4143caaa5796c4e6cfaa6b13d46b409819d822d7 (diff) | |
| parent | f32995543de85db093272fc53587dc7fc2203b18 (diff) | |
| download | servo-e89dd05a169aa16267bdb2dbfe5bca01ad6cfe84.tar.gz servo-e89dd05a169aa16267bdb2dbfe5bca01ad6cfe84.zip | |
Auto merge of #9230 - Aesthetikx:move_epoch_to_gfx_traits, r=KiChjang
Move Epoch to gfx_traits
Resolves #9222. Moved Epoch from components/msg/compositor_msg to
components/gfx_traits/lib. Updated use statements to reflect the move.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9230)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/layout_interface.rs')
| -rw-r--r-- | components/script/layout_interface.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/components/script/layout_interface.rs b/components/script/layout_interface.rs index 9d407c4e8b2..ec889087ec8 100644 --- a/components/script/layout_interface.rs +++ b/components/script/layout_interface.rs @@ -10,9 +10,8 @@ use app_units::Au; use dom::node::OpaqueStyleAndLayoutData; use euclid::point::Point2D; use euclid::rect::Rect; -use gfx_traits::LayerId; +use gfx_traits::{Epoch, LayerId}; use ipc_channel::ipc::{IpcReceiver, IpcSender}; -use msg::compositor_msg::Epoch; use msg::constellation_msg::{ConstellationChan, Failure, PipelineId}; use msg::constellation_msg::{WindowSizeData}; use net_traits::image_cache_thread::ImageCacheThread; |