diff options
Diffstat (limited to 'components/layout')
| -rw-r--r-- | components/layout/layout_task.rs | 20 | ||||
| -rw-r--r-- | components/layout/parallel.rs | 6 |
2 files changed, 14 insertions, 12 deletions
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index 6347509ad90..a7a39233cc9 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -44,7 +44,7 @@ use opaque_node::OpaqueNodeMethods; use parallel::{self, WorkQueueData}; use profile_traits::mem::{self, Report, ReportKind, ReportsChan}; use profile_traits::time::{TimerMetadataFrameType, TimerMetadataReflowType}; -use profile_traits::time::{self, ProfilerMetadata, profile}; +use profile_traits::time::{self, TimerMetadata, profile}; use query::{LayoutRPCImpl, process_content_box_request, process_content_boxes_request}; use query::{MarginPadding, MarginRetrievingFragmentBorderBoxIterator, PositionProperty}; use query::{PositionRetrievingFragmentBorderBoxIterator, Side}; @@ -1434,18 +1434,20 @@ impl LayoutTask { } /// Returns profiling information which is passed to the time profiler. - fn profiler_metadata(&self) -> ProfilerMetadata { - Some((&self.url, - if self.is_iframe { + fn profiler_metadata(&self) -> Option<TimerMetadata> { + Some(TimerMetadata { + url: self.url.serialize(), + iframe: if self.is_iframe { TimerMetadataFrameType::IFrame - } else { + } else { TimerMetadataFrameType::RootWindow - }, - if self.first_reflow.get() { + }, + incremental: if self.first_reflow.get() { TimerMetadataReflowType::FirstReflow - } else { + } else { TimerMetadataReflowType::Incremental - })) + }, + }) } } 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<TimerMetadata>, time_profiler_chan: time::ProfilerChan, shared_layout_context: &SharedLayoutContext, queue: &mut WorkQueue<SharedLayoutContext, WorkQueueData>) { @@ -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<TimerMetadata>, time_profiler_chan: time::ProfilerChan, shared_layout_context: &SharedLayoutContext, queue: &mut WorkQueue<SharedLayoutContext, WorkQueueData>) { |