From ff0acccc061c0894e40bbda4b318bc7ab8615367 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 6 Nov 2015 13:10:37 +0100 Subject: Consolidate ProfilerMetadata and TimerMetadata. There is no good reason to have the two types. This also means that the result of LayoutTask::profiler_metadata no longer borrows the LayoutTask, which I'll need later. --- components/layout/parallel.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'components/layout/parallel.rs') diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs index eddac889c50..658ce8030d6 100644 --- a/components/layout/parallel.rs +++ b/components/layout/parallel.rs @@ -12,7 +12,7 @@ use context::{LayoutContext, SharedLayoutContext}; use flow::{self, Flow, MutableFlowUtils, PostorderFlowTraversal, PreorderFlowTraversal}; use flow_ref::{self, FlowRef}; use gfx::display_list::OpaqueNode; -use profile_traits::time::{self, ProfilerMetadata, profile}; +use profile_traits::time::{self, TimerMetadata, profile}; use std::mem; use std::sync::atomic::{AtomicIsize, Ordering}; use traversal::PostorderNodeMutTraversal; @@ -465,7 +465,7 @@ pub fn traverse_dom_preorder(root: LayoutNode, pub fn traverse_flow_tree_preorder( root: &mut FlowRef, - profiler_metadata: ProfilerMetadata, + profiler_metadata: Option, time_profiler_chan: time::ProfilerChan, shared_layout_context: &SharedLayoutContext, queue: &mut WorkQueue) { @@ -488,7 +488,7 @@ pub fn traverse_flow_tree_preorder( pub fn build_display_list_for_subtree( root: &mut FlowRef, - profiler_metadata: ProfilerMetadata, + profiler_metadata: Option, time_profiler_chan: time::ProfilerChan, shared_layout_context: &SharedLayoutContext, queue: &mut WorkQueue) { -- cgit v1.2.3