aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout_thread/lib.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/layout_thread/lib.rs')
-rw-r--r--components/layout_thread/lib.rs20
1 files changed, 10 insertions, 10 deletions
diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs
index a1948f1ce65..61e718babde 100644
--- a/components/layout_thread/lib.rs
+++ b/components/layout_thread/lib.rs
@@ -55,10 +55,10 @@ use net_traits::image_cache::{ImageCache, UsePlaceholder};
use net_traits::ResourceThreads;
use parking_lot::RwLock;
use profile_traits::mem::{Report, ReportKind};
-use profile_traits::path;
use profile_traits::time::{
- self as profile_time, profile, TimerMetadata, TimerMetadataFrameType, TimerMetadataReflowType,
+ self as profile_time, TimerMetadata, TimerMetadataFrameType, TimerMetadataReflowType,
};
+use profile_traits::{path, time_profile};
use script::layout_dom::{ServoLayoutDocument, ServoLayoutElement, ServoLayoutNode};
use script_layout_interface::wrapper_traits::LayoutNode;
use script_layout_interface::{
@@ -528,7 +528,7 @@ impl Layout for LayoutThread {
fn reflow(&mut self, script_reflow: script_layout_interface::ScriptReflow) {
let mut result = ScriptReflowResult::new(script_reflow);
- profile(
+ time_profile!(
profile_time::ProfilerCategory::LayoutPerform,
self.profiler_metadata(),
self.time_profiler_chan.clone(),
@@ -838,7 +838,7 @@ impl LayoutThread {
) {
let writing_mode = layout_root.base().writing_mode;
let (metadata, sender) = (self.profiler_metadata(), self.time_profiler_chan.clone());
- profile(
+ time_profile!(
profile_time::ProfilerCategory::LayoutDispListBuild,
metadata.clone(),
sender.clone(),
@@ -1103,7 +1103,7 @@ impl LayoutThread {
if token.should_traverse() {
// Recalculate CSS styles and rebuild flows and fragments.
- profile(
+ time_profile!(
profile_time::ProfilerCategory::LayoutStyleRecalc,
self.profiler_metadata(),
self.time_profiler_chan.clone(),
@@ -1248,7 +1248,7 @@ impl LayoutThread {
FlowRef::deref_mut(root_flow),
);
- profile(
+ time_profile!(
profile_time::ProfilerCategory::LayoutRestyleDamagePropagation,
self.profiler_metadata(),
self.time_profiler_chan.clone(),
@@ -1270,7 +1270,7 @@ impl LayoutThread {
}
// Resolve generated content.
- profile(
+ time_profile!(
profile_time::ProfilerCategory::LayoutGeneratedContent,
self.profiler_metadata(),
self.time_profiler_chan.clone(),
@@ -1278,7 +1278,7 @@ impl LayoutThread {
);
// Guess float placement.
- profile(
+ time_profile!(
profile_time::ProfilerCategory::LayoutFloatPlacementSpeculation,
self.profiler_metadata(),
self.time_profiler_chan.clone(),
@@ -1292,7 +1292,7 @@ impl LayoutThread {
.restyle_damage
.intersects(ServoRestyleDamage::REFLOW | ServoRestyleDamage::REFLOW_OUT_OF_FLOW)
{
- profile(
+ time_profile!(
profile_time::ProfilerCategory::LayoutMain,
self.profiler_metadata(),
self.time_profiler_chan.clone(),
@@ -1316,7 +1316,7 @@ impl LayoutThread {
);
}
- profile(
+ time_profile!(
profile_time::ProfilerCategory::LayoutStoreOverflow,
self.profiler_metadata(),
self.time_profiler_chan.clone(),