diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-05-22 09:17:13 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-05-22 09:17:13 -0400 |
| commit | 891ca7378583418c8739d833b21173f012258cbf (patch) | |
| tree | 93605d46da5c35295257241956836d49269627cb /src/components/main/layout/construct.rs | |
| parent | 28e3c1734048217cd2194ea37c887911ad03e894 (diff) | |
| parent | 0bb518561ee323d49efa598a29b7b71316c0e588 (diff) | |
| download | servo-891ca7378583418c8739d833b21173f012258cbf.tar.gz servo-891ca7378583418c8739d833b21173f012258cbf.zip | |
auto merge of #2411 : glennw/servo/issue-2335, r=pcwalton
Diffstat (limited to 'src/components/main/layout/construct.rs')
| -rw-r--r-- | src/components/main/layout/construct.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/components/main/layout/construct.rs b/src/components/main/layout/construct.rs index 78a2fde4e84..ef6d737f2d9 100644 --- a/src/components/main/layout/construct.rs +++ b/src/components/main/layout/construct.rs @@ -879,9 +879,11 @@ impl<'a> PostorderNodeMutTraversal for FlowConstructor<'a> { // Absolutely positioned elements will have computed value of // `float` as 'none' and `display` as per the table. - // Currently, for original `display` value of 'inline', the new - // `display` value is 'block'. - (_, _, position::absolute) | (_, _, position::fixed) => { + // Only match here for block items. If an item is absolutely + // positioned, but inline we shouldn't try to construct a block + // flow here - instead, let it match the inline case + // below. + (display::block, _, position::absolute) | (_, _, position::fixed) => { node.set_flow_construction_result(self.build_flow_for_block(node)) } |