aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/parallel.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2015-11-10 07:47:45 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2015-11-10 07:47:45 +0530
commit0d21158eb3bc8cb64a1953ab77b57e813bd429ed (patch)
tree88ee3e18713f87b53d4326c00f40b70e1c1e6ac0 /components/layout/parallel.rs
parentb386008623132deca21049f125ac761b20edc1dd (diff)
parent1919e1963381f518c7cb59a45303bd0466db034b (diff)
downloadservo-0d21158eb3bc8cb64a1953ab77b57e813bd429ed.tar.gz
servo-0d21158eb3bc8cb64a1953ab77b57e813bd429ed.zip
Auto merge of #8378 - Ms2ger:rwdata, r=eefriedman
Reduce LayoutTaskData to the fields used for RPC. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8378) <!-- Reviewable:end -->
Diffstat (limited to 'components/layout/parallel.rs')
-rw-r--r--components/layout/parallel.rs6
1 files changed, 3 insertions, 3 deletions
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>) {