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/lib.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/lib.rs')
-rw-r--r-- | components/layout/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/layout/lib.rs b/components/layout/lib.rs index 6eb177f6f94..00bd3896af5 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -67,7 +67,9 @@ pub mod flow; pub mod flow_list; pub mod flow_ref; pub mod fragment; +pub mod generated_content; pub mod layout_task; +pub mod incremental; pub mod inline; pub mod list_item; pub mod model; @@ -83,7 +85,6 @@ pub mod table_row; pub mod table_cell; pub mod text; pub mod traversal; -pub mod incremental; pub mod wrapper; pub mod css { |