diff options
author | Patrick Walton <pcwalton@mimiga.net> | 2014-11-05 10:08:31 -0800 |
---|---|---|
committer | Patrick Walton <pcwalton@mimiga.net> | 2014-11-18 15:36:04 -0800 |
commit | 55da2c97d5499c3451cdf2a2afee6932128b35a9 (patch) | |
tree | 4b82babcaccd0c3f59b34c480eeb11d99d6f6289 /components/layout/inline.rs | |
parent | be36fcd3b1ee7da1c5a754132f5f95ac27b5c636 (diff) | |
download | servo-55da2c97d5499c3451cdf2a2afee6932128b35a9.tar.gz servo-55da2c97d5499c3451cdf2a2afee6932128b35a9.zip |
layout: Incrementalize reflow of block formatting contexts impacted by
floats, and make float placement idempotent.
This moves float placement outside sequential block size computation.
Improves the maze solver.
Diffstat (limited to 'components/layout/inline.rs')
-rw-r--r-- | components/layout/inline.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 31ca89d3c75..73332023d5d 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -8,7 +8,7 @@ use css::node_style::StyledNode; use context::LayoutContext; use display_list_builder::{ContentLevel, DisplayListResult, FragmentDisplayListBuilding}; use floats::{FloatLeft, Floats, PlacementInfo}; -use flow::{BaseFlow, FlowClass, Flow, InlineFlowClass, MutableFlowUtils}; +use flow::{BaseFlow, FlowClass, Flow, ForceNonfloated, InlineFlowClass, MutableFlowUtils}; use flow::{IS_ABSOLUTELY_POSITIONED}; use flow; use fragment::{Fragment, InlineAbsoluteHypotheticalFragment, InlineBlockFragment}; @@ -706,7 +706,7 @@ pub struct InlineFlow { impl InlineFlow { pub fn from_fragments(fragments: InlineFragments, writing_mode: WritingMode) -> InlineFlow { InlineFlow { - base: BaseFlow::new(None, writing_mode), + base: BaseFlow::new(None, writing_mode, ForceNonfloated), fragments: fragments, lines: Vec::new(), minimum_block_size_above_baseline: Au(0), |