aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/parallel.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-01-04 12:39:47 -0700
committerbors-servo <metajack+bors@gmail.com>2015-01-04 12:39:47 -0700
commitba8cf6b0e6145265f9472d4855f078d8b5943fe7 (patch)
tree4ce7adac90149382d40392c2019c17aa7af76d35 /components/layout/parallel.rs
parent2e17cae5d080db72d5f89733d19e0304857cfd34 (diff)
parent79d052797823a7c26772bda84b8afeff92825306 (diff)
downloadservo-ba8cf6b0e6145265f9472d4855f078d8b5943fe7.tar.gz
servo-ba8cf6b0e6145265f9472d4855f078d8b5943fe7.zip
auto merge of #4542 : servo/servo/pre-rustup_20141221, r=saneyuki
In particular, this contains changes to qualify enums where rust will require it, and to stop using some features that will be removed.
Diffstat (limited to 'components/layout/parallel.rs')
-rw-r--r--components/layout/parallel.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs
index 5537ba95998..a6a20ad33ba 100644
--- a/components/layout/parallel.rs
+++ b/components/layout/parallel.rs
@@ -19,7 +19,7 @@ use wrapper::{PostorderNodeMutTraversal, UnsafeLayoutNode};
use wrapper::{PreorderDomTraversal, PostorderDomTraversal};
use servo_util::opts;
-use servo_util::time::{mod, ProfilerMetadata, TimeProfilerChan, profile};
+use servo_util::time::{TimeProfilerCategory, ProfilerMetadata, TimeProfilerChan, profile};
use servo_util::workqueue::{WorkQueue, WorkUnit, WorkerProxy};
use std::mem;
use std::ptr;
@@ -432,7 +432,8 @@ pub fn traverse_flow_tree_preorder(root: &mut FlowRef,
queue.data = shared_layout_context as *const _;
- profile(time::LayoutParallelWarmupCategory, profiler_metadata, time_profiler_chan, || {
+ profile(TimeProfilerCategory::LayoutParallelWarmup, profiler_metadata,
+ time_profiler_chan, || {
queue.push(WorkUnit {
fun: assign_inline_sizes,
data: mut_owned_flow_to_unsafe_flow(root),
@@ -451,7 +452,8 @@ pub fn build_display_list_for_subtree(root: &mut FlowRef,
queue: &mut WorkQueue<*const SharedLayoutContext,UnsafeFlow>) {
queue.data = shared_layout_context as *const _;
- profile(time::LayoutParallelWarmupCategory, profiler_metadata, time_profiler_chan, || {
+ profile(TimeProfilerCategory::LayoutParallelWarmup, profiler_metadata,
+ time_profiler_chan, || {
queue.push(WorkUnit {
fun: compute_absolute_positions,
data: mut_owned_flow_to_unsafe_flow(root),