Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10623 - pcwalton:reddit-float-fix, r=mbrubeck

Browse source 
layout: Reset values appropriately for floats flowing out of blocks with nonzero inline margins.

These two commits correctly position the hamburger menu icons on http://reddit.com/r/rust.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10623)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-28 10:24:38 -07:00
commit fcb1352e97
5 changed files with 94 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/layout/block.rs
View file

@ -1020,8 +1020,12 @@ impl BlockFlow {
self.base.position.size.block = cur_b; self.base.position.size.block = cur_b;
} }
// Store the current set of floats in the flow so that flows that come later in the // Translate the current set of floats back into the parent coordinate system in the
// inline direction, and store them in the flow so that flows that come later in the
// document can access them. // document can access them.
floats.translate(LogicalSize::new(writing_mode,
self.fragment.inline_start_offset(),
Au(0)));
self.base.floats = floats.clone(); self.base.floats = floats.clone();
self.adjust_fragments_for_collapsed_margins_if_root(layout_context); self.adjust_fragments_for_collapsed_margins_if_root(layout_context);
} else { } else {

5
components/layout/floats.rs
View file

@ -470,6 +470,7 @@ impl SpeculatedFloatPlacement {
let block_flow = flow.as_block(); let block_flow = flow.as_block();
if block_flow.formatting_context_type() != FormattingContextType::None { if block_flow.formatting_context_type() != FormattingContextType::None {
*self = block_flow.base.speculated_float_placement_in; *self = block_flow.base.speculated_float_placement_in;
}
if self.left > Au(0) || self.right > Au(0) { if self.left > Au(0) || self.right > Au(0) {
let speculated_inline_content_edge_offsets = let speculated_inline_content_edge_offsets =
@ -481,6 +482,10 @@ impl SpeculatedFloatPlacement {
self.right = self.right + speculated_inline_content_edge_offsets.end self.right = self.right + speculated_inline_content_edge_offsets.end
} }
} }
if block_flow.formatting_context_type() == FormattingContextType::None {
self.left = max(self.left, block_flow.base.speculated_float_placement_in.left);
self.right = max(self.right, block_flow.base.speculated_float_placement_in.right);
} }
} }

24
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -1608,6 +1608,18 @@
"url": "/_mozilla/css/floated_table_with_margin_a.html" "url": "/_mozilla/css/floated_table_with_margin_a.html"
} }
], ],
"css/floats_inline_margins_a.html": [
{
"path": "css/floats_inline_margins_a.html",
"references": [
[
"/_mozilla/css/floats_inline_margins_ref.html",
"=="
]
],
"url": "/_mozilla/css/floats_inline_margins_a.html"
}
],
"css/floats_margin_collapse_a.html": [ "css/floats_margin_collapse_a.html": [
{ {
"path": "css/floats_margin_collapse_a.html", "path": "css/floats_margin_collapse_a.html",
@ -8336,6 +8348,18 @@
"url": "/_mozilla/css/floated_table_with_margin_a.html" "url": "/_mozilla/css/floated_table_with_margin_a.html"
} }
], ],
"css/floats_inline_margins_a.html": [
{
"path": "css/floats_inline_margins_a.html",
"references": [
[
"/_mozilla/css/floats_inline_margins_ref.html",
"=="
]
],
"url": "/_mozilla/css/floats_inline_margins_a.html"
}
],
"css/floats_margin_collapse_a.html": [ "css/floats_margin_collapse_a.html": [
{ {
"path": "css/floats_margin_collapse_a.html", "path": "css/floats_margin_collapse_a.html",

27
tests/wpt/mozilla/tests/css/floats_inline_margins_a.html Normal file
View file

@ -0,0 +1,27 @@
<!DOCTYPE html>
<meta charset="utf-8">
<title></title>
<link rel="match" href="floats_inline_margins_ref.html">
<style>
html, body, p {
margin: 0;
padding: 0;
}
div {
background-color: gold;
float: left;
height: 27px;
width: 27px;
}
#first {
margin-left: 27px;
}
</style>
</head>
<body>
<div></div>
<p id=first>submitted</p>
<p>x</p>
</body>
</html>

24
tests/wpt/mozilla/tests/css/floats_inline_margins_ref.html Normal file
View file

@ -0,0 +1,24 @@
<!DOCTYPE html>
<meta charset="utf-8">
<title></title>
<style>
html, body, p {
margin: 0;
padding: 0;
}
div {
background-color: gold;
float: left;
height: 27px;
width: 27px;
border-bottom: solid white 27px;
}
</style>
</head>
<body>
<div></div>
<p id=first>submitted</p>
<p>x</p>
</body>
</html>