aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/layout_thread.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-01-11 23:57:51 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-01-11 23:57:51 +0530
commit47617578af97204168fb985b956d8c85c2b9f349 (patch)
treea2bbed701756c5777efcad969cec1068fb41b542 /components/layout/layout_thread.rs
parent099beee85c02d391b854dc5e06da34f89df8b760 (diff)
parent9dc85e0d40ad207d05003103719dbfe217223e3a (diff)
downloadservo-47617578af97204168fb985b956d8c85c2b9f349.tar.gz
servo-47617578af97204168fb985b956d8c85c2b9f349.zip
Auto merge of #9245 - Ms2ger:reexports, r=nox
Stop reexporting style types from layout_interface. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9245) <!-- Reviewable:end -->
Diffstat (limited to 'components/layout/layout_thread.rs')
-rw-r--r--components/layout/layout_thread.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/layout/layout_thread.rs b/components/layout/layout_thread.rs
index 86b86b2793d..57e92dc8bf2 100644
--- a/components/layout/layout_thread.rs
+++ b/components/layout/layout_thread.rs
@@ -44,9 +44,8 @@ use profile_traits::time::{self, TimerMetadata, profile};
use query::{LayoutRPCImpl, process_content_box_request, process_content_boxes_request};
use query::{process_node_geometry_request, process_offset_parent_query, process_resolved_style_request};
use script::dom::node::OpaqueStyleAndLayoutData;
-use script::layout_interface::Animation;
use script::layout_interface::{LayoutRPC, OffsetParentResponse};
-use script::layout_interface::{Msg, NewLayoutThreadInfo, Reflow, ReflowGoal, ReflowQueryType};
+use script::layout_interface::{Msg, NewLayoutThreadInfo, Reflow, ReflowQueryType};
use script::layout_interface::{ScriptLayoutChan, ScriptReflow};
use script::reporter::CSSErrorReporter;
use script_traits::ConstellationControlMsg;
@@ -62,8 +61,9 @@ use std::ops::{Deref, DerefMut};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::mpsc::{channel, Sender, Receiver};
use std::sync::{Arc, Mutex, MutexGuard, RwLock};
+use style::animation::Animation;
use style::computed_values::{filter, mix_blend_mode};
-use style::context::{SharedStyleContext, StylistWrapper};
+use style::context::{SharedStyleContext, StylistWrapper, ReflowGoal};
use style::dom::{TDocument, TElement, TNode};
use style::media_queries::{Device, MediaType};
use style::parallel::WorkQueueData;