diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-03 10:42:52 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-03 10:42:52 -0700 |
| commit | 5cd6316addc1acf145ed3220719387ef6ef08d2f (patch) | |
| tree | 7d8daec9db46a555ef567e356f5ab08488f9c71c /components/util/time.rs | |
| parent | 6fcc02e92f4c519239a834dc37a2965a4993322a (diff) | |
| parent | 4c8bde5736853ae68332d1f97cc6f0b02499e35f (diff) | |
| download | servo-5cd6316addc1acf145ed3220719387ef6ef08d2f.tar.gz servo-5cd6316addc1acf145ed3220719387ef6ef08d2f.zip | |
auto merge of #5067 : servo/servo/counters, r=SimonSapin
Only simple alphabetic and numeric counter styles are supported. (This
is most of them though.)
Although this PR adds a sequential pass to layout, I verified that on
pages that contain a reasonable number of ordered lists (Reddit
`/r/rust`), the time spent in generated content resolution is dwarfed by
the time spent in the parallelizable parts of layout. So I don't expect
this to negatively affect our parallelism expect perhaps in pathological
cases.
Moved from #4544, because Critic.
Fixes #4544.
Diffstat (limited to 'components/util/time.rs')
| -rw-r--r-- | components/util/time.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/components/util/time.rs b/components/util/time.rs index 46de5abbceb..c9cf32c0617 100644 --- a/components/util/time.rs +++ b/components/util/time.rs @@ -81,6 +81,7 @@ pub enum TimeProfilerCategory { LayoutSelectorMatch, LayoutTreeBuilder, LayoutDamagePropagate, + LayoutGeneratedContent, LayoutMain, LayoutParallelWarmup, LayoutShaping, @@ -99,6 +100,7 @@ impl Formatable for TimeProfilerCategory { TimeProfilerCategory::LayoutStyleRecalc | TimeProfilerCategory::LayoutRestyleDamagePropagation | TimeProfilerCategory::LayoutNonIncrementalReset | + TimeProfilerCategory::LayoutGeneratedContent | TimeProfilerCategory::LayoutMain | TimeProfilerCategory::LayoutDispListBuild | TimeProfilerCategory::LayoutShaping | @@ -119,6 +121,7 @@ impl Formatable for TimeProfilerCategory { TimeProfilerCategory::LayoutSelectorMatch => "Selector Matching", TimeProfilerCategory::LayoutTreeBuilder => "Tree Building", TimeProfilerCategory::LayoutDamagePropagate => "Damage Propagation", + TimeProfilerCategory::LayoutGeneratedContent => "Generated Content Resolution", TimeProfilerCategory::LayoutMain => "Primary Layout Pass", TimeProfilerCategory::LayoutParallelWarmup => "Parallel Warmup", TimeProfilerCategory::LayoutShaping => "Shaping", |