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

Pass the SharedLayoutContext to FlowTraversalFunctions directly.

Browse source
This commit is contained in:
Ms2ger 2015-07-23 19:30:26 +02:00
parent 17a9f8507e
commit a18dea6578
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/layout/parallel.rs
View file

@ -98,8 +98,7 @@ pub type DomTraversalFunction =
pub type ChunkedFlowTraversalFunction = pub type ChunkedFlowTraversalFunction =
extern "Rust" fn(UnsafeFlowList, &mut WorkerProxy<SharedLayoutContext,UnsafeFlowList>); extern "Rust" fn(UnsafeFlowList, &mut WorkerProxy<SharedLayoutContext,UnsafeFlowList>);
pub type FlowTraversalFunction = pub type FlowTraversalFunction = extern "Rust" fn(UnsafeFlow, &SharedLayoutContext);
extern "Rust" fn(UnsafeFlow, &mut WorkerProxy<SharedLayoutContext,UnsafeFlowList>);
/// A parallel top-down DOM traversal. /// A parallel top-down DOM traversal.
pub trait ParallelPreorderDomTraversal : PreorderDomTraversal { pub trait ParallelPreorderDomTraversal : PreorderDomTraversal {
@ -321,7 +320,7 @@ trait ParallelPreorderFlowTraversal : PreorderFlowTraversal {
// If there were no more children, start assigning block-sizes. // If there were no more children, start assigning block-sizes.
if !had_children { if !had_children {
bottom_up_func(unsafe_flow, proxy) bottom_up_func(unsafe_flow, proxy.user_data())
} }
} }
@ -412,8 +411,7 @@ fn assign_inline_sizes(unsafe_flows: UnsafeFlowList,
fn assign_block_sizes_and_store_overflow( fn assign_block_sizes_and_store_overflow(
unsafe_flow: UnsafeFlow, unsafe_flow: UnsafeFlow,
proxy: &mut WorkerProxy<SharedLayoutContext,UnsafeFlowList>) { shared_layout_context: &SharedLayoutContext) {
let shared_layout_context = proxy.user_data();
let layout_context = LayoutContext::new(shared_layout_context); let layout_context = LayoutContext::new(shared_layout_context);
let assign_block_sizes_traversal = AssignBSizesAndStoreOverflow { let assign_block_sizes_traversal = AssignBSizesAndStoreOverflow {
layout_context: &layout_context, layout_context: &layout_context,
@ -433,8 +431,7 @@ fn compute_absolute_positions(
} }
fn build_display_list(unsafe_flow: UnsafeFlow, fn build_display_list(unsafe_flow: UnsafeFlow,
proxy: &mut WorkerProxy<SharedLayoutContext, UnsafeFlowList>) { shared_layout_context: &SharedLayoutContext) {
let shared_layout_context = proxy.user_data();
let layout_context = LayoutContext::new(shared_layout_context); let layout_context = LayoutContext::new(shared_layout_context);
let build_display_list_traversal = BuildDisplayList { let build_display_list_traversal = BuildDisplayList {