Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove the data field from WorkQueue.

Browse source 
It is only used in the run method.
This commit is contained in:
Ms2ger 2015-06-28 22:17:55 +02:00
parent c214c03375
commit 41da4fceee
3 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/layout/layout_task.rs
View file

@ -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
};

7
components/layout/parallel.rs
View file

@ -21,7 +21,6 @@ use wrapper::{PreorderDomTraversal, PostorderDomTraversal};
use profile_traits::time::{self, ProfilerMetadata, profile};
use std::mem;
use std::ptr;
use std::sync::atomic::{AtomicIsize, Ordering};
use util::opts;
use util::workqueue::{WorkQueue, WorkUnit, WorkerProxy};
@ -449,15 +448,11 @@ fn run_queue_with_custom_work_data_type<To,F>(
callback: F,
shared_layout_context: &SharedLayoutContext)
where To: 'static + Send, F: FnOnce(&mut WorkQueue<SharedLayoutContextWrapper,To>) {
queue.data = SharedLayoutContextWrapper(shared_layout_context as *const _);
let queue: &mut WorkQueue<SharedLayoutContextWrapper,To> = unsafe {
mem::transmute(queue)
};
callback(queue);
queue.run();
queue.data = SharedLayoutContextWrapper(ptr::null());
queue.run(SharedLayoutContextWrapper(shared_layout_context as *const _));
}
pub fn traverse_dom_preorder(root: LayoutNode,