Auto merge of #6547 - Ms2ger:workqueue-reference, r=pcwalton

Borrow the QueueData for WorkQueue::run.

This allows us to get rid of the raw pointers and unsafe dereferencing in
the parallel layout implementation.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6547)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-06 08:29:17 -06:00
commit a3821bf240
4 changed files with 46 additions and 47 deletions

View file

@ -9,7 +9,7 @@
use animation;
use construct::ConstructionResult;
use context::{SharedLayoutContext, SharedLayoutContextWrapper, heap_size_of_local_context};
use context::{SharedLayoutContext, heap_size_of_local_context};
use css::node_style::StyledNode;
use data::LayoutDataWrapper;
use display_list_builder::ToGfxColor;
@ -108,7 +108,7 @@ pub struct LayoutTaskData {
pub stylist: Box<Stylist>,
/// The workers that we use for parallel operation.
pub parallel_traversal: Option<WorkQueue<SharedLayoutContextWrapper, WorkQueueData>>,
pub parallel_traversal: Option<WorkQueue<SharedLayoutContext, WorkQueueData>>,
/// The dirty rect. Used during display list construction.
pub dirty: Rect<Au>,