diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-07-03 07:22:44 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-07-03 07:22:44 -0600 |
| commit | d09881b051e01f145bf701d48d6d91167bccbe30 (patch) | |
| tree | fddbd8a6c796c057b28ddd37cc473991f35de9a9 /components/layout/layout_task.rs | |
| parent | 59d3b45b74a22fa807872b78e881991e86f7c6ee (diff) | |
| parent | 41da4fceee653366bb709539c1ce3a873a08b695 (diff) | |
| download | servo-d09881b051e01f145bf701d48d6d91167bccbe30.tar.gz servo-d09881b051e01f145bf701d48d6d91167bccbe30.zip | |
Auto merge of #6513 - Ms2ger:workqueue-data, r=pcwalton
Remove the data field from WorkQueue.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6513)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/layout_task.rs')
| -rw-r--r-- | components/layout/layout_task.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index e3349ef19de..172fcf2ed3f 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -300,8 +300,7 @@ impl LayoutTask { opts::get().initial_window_size.as_f32() * ScaleFactor::new(1.0)); let parallel_traversal = if opts::get().layout_threads != 1 { Some(WorkQueue::new("LayoutWorker", task_state::LAYOUT, - opts::get().layout_threads, - SharedLayoutContextWrapper(ptr::null()))) + opts::get().layout_threads)) } else { None }; |