diff options
author | Patrick Walton <pcwalton@mimiga.net> | 2014-09-12 14:10:44 -0700 |
---|---|---|
committer | Patrick Walton <pcwalton@mimiga.net> | 2014-09-12 14:10:44 -0700 |
commit | 20cde10e124df5c9aa9bd475bfb2b05493c114f6 (patch) | |
tree | 954ead296f9c0a8179320008b8ad0a832e537f17 /components/layout/construct.rs | |
parent | 883fc2e404855440c0165be1b8c28ca692f01830 (diff) | |
parent | 41ffec0378f23c0781fedc8e9d578d69b4d48f0c (diff) | |
download | servo-20cde10e124df5c9aa9bd475bfb2b05493c114f6.tar.gz servo-20cde10e124df5c9aa9bd475bfb2b05493c114f6.zip |
Merge pull request #3293 from pcwalton/floated-generated-content-crash
layout: Don't crash on floated generated content.
Diffstat (limited to 'components/layout/construct.rs')
-rw-r--r-- | components/layout/construct.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs index 0f832bacfb8..e30838acbc5 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -833,7 +833,9 @@ impl<'a, 'b> PostorderNodeMutTraversal for FlowConstructor<'a, 'b> { } // Inline items contribute inline fragment construction results. - (display::inline, float::none, _) => { + // + // FIXME(pcwalton, #3307): This is not sufficient to handle floated generated content. + (display::inline, _, _) => { let construction_result = self.build_fragments_for_inline(node); node.set_flow_construction_result(construction_result) } |