Auto merge of #5918 - pcwalton:block-formatting-context-float-placeme…

…nt, r=mbrubeck Improves Amazon. r? @mbrubeck  [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5918)
servo · May 1, 2015 · a346f95 · a346f95
2 parents ba8eaac + 986f81a
commit a346f95
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 3 deletions.
diff --git a/components/layout/block.rs b/components/layout/block.rs
@@ -1395,9 +1395,7 @@ impl BlockFlow {
         }
 
         let info = PlacementInfo {
-            size: LogicalSize::new(self.fragment.style.writing_mode,
-                                   self.base.position.size.inline,
-                                   self.fragment.border_box.size.block),
+            size: self.fragment.border_box.size,
             ceiling: self.base.position.start.b,
             max_inline_size: MAX_AU,
             kind: FloatKind::Left,

diff --git a/tests/ref/basic.list b/tests/ref/basic.list
@@ -66,6 +66,7 @@ flaky_cpu == append_style_a.html append_style_b.html
 == block_formatting_context_cleared_float_a.html block_formatting_context_cleared_float_ref.html
 == block_formatting_context_complex_a.html block_formatting_context_complex_ref.html
 == block_formatting_context_containing_floats_a.html block_formatting_context_containing_floats_ref.html
+== block_formatting_context_float_placement_a.html block_formatting_context_float_placement_ref.html
 == block_formatting_context_relative_a.html block_formatting_context_ref.html
 == block_formatting_context_translation_a.html block_formatting_context_translation_ref.html
 == block_image.html 500x300_green.html

diff --git a/tests/ref/block_formatting_context_float_placement_a.html b/tests/ref/block_formatting_context_float_placement_a.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#nav-searchbar {
+	overflow: hidden;
+}
+.nav-submit-button {
+	float: right;
+}
+#nav-search-in {
+	float: left;
+}
+.nav-searchfield-width {
+	height: 35px;
+	overflow: hidden;
+	border: solid black 1px;
+}
+</style>
+</head>
+
+<body>
+	<form id="nav-searchbar">
+		<div class="nav-submit-button">Foo</div><span id="nav-search-in">Bar</span>
+		<div class="nav-searchfield-width"></div>
+	</form>
+</body>
+</html>
diff --git a/tests/ref/block_formatting_context_float_placement_ref.html b/tests/ref/block_formatting_context_float_placement_ref.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+.nav-submit-button {
+	float: right;
+}
+#nav-search-in {
+	float: left;
+}
+.nav-searchfield-width {
+	height: 35px;
+	overflow: hidden;
+	border: solid black 1px;
+}
+</style>
+</head>
+
+<body>
+	<form id="nav-searchbar">
+		<div class="nav-submit-button">Foo</div><span id="nav-search-in">Bar</span>
+		<div class="nav-searchfield-width"></div>
+	</form>
+</body>
+</html>