aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/layout_task.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2015-11-24 04:01:32 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2015-11-24 04:01:32 +0530
commit711f516d80c9c0026744cd373d398dc294f14d2a (patch)
treeeaca2f68cede9642add82670bdc884e39fead10c /components/layout/layout_task.rs
parent6449cd09ebd7f7e3545039c26bcbe9a6ca7a5621 (diff)
parentafa3834f3be849cd4e6745b9fe763df512e4f9fc (diff)
downloadservo-711f516d80c9c0026744cd373d398dc294f14d2a.tar.gz
servo-711f516d80c9c0026744cd373d398dc294f14d2a.zip
Auto merge of #8639 - bholley:generalize_wrappers2, r=pcwalton
Use associated types for layout wrapper trait, and generalized ThreadSafeLayoutFoo <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8639) <!-- Reviewable:end -->
Diffstat (limited to 'components/layout/layout_task.rs')
-rw-r--r--components/layout/layout_task.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index 60a0ec80120..d9bbc2b78cc 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -73,7 +73,8 @@ use util::opts;
use util::task;
use util::task_state;
use util::workqueue::WorkQueue;
-use wrapper::{LayoutDocument, LayoutElement, LayoutNode, ServoLayoutNode};
+use wrapper::{LayoutDocument, LayoutElement, LayoutNode};
+use wrapper::{ServoLayoutNode, ThreadSafeLayoutNode};
/// The number of screens of data we're allowed to generate display lists for in each direction.
pub const DISPLAY_PORT_SIZE_FACTOR: i32 = 8;