diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-09 23:24:47 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-09 23:24:47 -0600 |
| commit | fd1bb49a65dd998c8ef9890a1576aaf62ddfdba1 (patch) | |
| tree | f426bc35a25e9f887f10856ee3e090b9e6cb5891 /components/layout/layout_task.rs | |
| parent | f4a362725faeb41aef85631965d3a4fd6153a70d (diff) | |
| parent | 8703cd974720ad336349febdaf2649cb08eeea67 (diff) | |
| download | servo-fd1bb49a65dd998c8ef9890a1576aaf62ddfdba1.tar.gz servo-fd1bb49a65dd998c8ef9890a1576aaf62ddfdba1.zip | |
auto merge of #5160 : pcwalton/servo/counters-redux, 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.
Reconstructed from #5138 via raw diffing.
r? @SimonSapin
Diffstat (limited to 'components/layout/layout_task.rs')
| -rw-r--r-- | components/layout/layout_task.rs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index 793bc083723..3e80d90639b 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -840,6 +840,14 @@ impl LayoutTask { layout_debug::begin_trace(layout_root.clone()); } + // Resolve generated content. + profile(TimeProfilerCategory::LayoutGeneratedContent, + self.profiler_metadata(data), + self.time_profiler_chan.clone(), + || { + sequential::resolve_generated_content(&mut layout_root, &shared_layout_context) + }); + // Perform the primary layout passes over the flow tree to compute the locations of all // the boxes. profile(TimeProfilerCategory::LayoutMain, |