layout: Fix float speculation with percentage inline sizes, rewrite vertical alignment, fix inline block ascent/descent computation, and fix absolute inline-block hypothetical boxes. #10691

pcwalton · 2016-04-18T20:59:05Z

This change is

highfive · 2016-04-18T20:59:09Z

Warning

These commits modify gfx and layout code, but no tests are modified. Please consider adding a test!

pcwalton · 2016-04-18T20:59:12Z

@bors-servo: try

bors-servo · 2016-04-18T20:59:14Z

⌛ Trying commit 872136d with merge f992004...


        Auto merge of #10691 - pcwalton:float-fixes, r=<try>

layout: Various fixes for floats. (NOT READY YET; DO NOT MERGE)

emilio · 2016-04-18T21:38:54Z

components/layout/block.rs

@@ -1528,6 +1528,9 @@ impl BlockFlow {
                left_float_width + right_float_width);

        self.base.intrinsic_inline_sizes = computation.finish();
+        /*if self.base.flags.is_float() {
+            println!("intrinsic inline sizes for float={:?}", self.base.intrinsic_inline_sizes);


Heh, printf-based debugging is the best kind of debugging ;-)

Jokes aside, great work trying to take all this floats bugs down!

bors-servo · 2016-04-18T21:48:50Z

💔 Test failed - linux-rel

emilio · 2016-04-18T21:51:43Z

  ▶ FAIL [expected PASS] /_mozilla/css/white-space-mixed-002.htm
  └   → /_mozilla/css/white-space-mixed-002.htm 094ec397037e69456a51b9f41e839bb07517361b
/_mozilla/css/white-space-mixed-002-ref.htm c11114d62a0df65ec487600581335e11858dc85a
Testing 094ec397037e69456a51b9f41e839bb07517361b == c11114d62a0df65ec487600581335e11858dc85a

Andd... A bunch of failing tests in test-css:

EDIT: Moved them into a gist

EDIT 2: Actually there are a few passes:

  ▶ PASS [expected FAIL] /css21_dev/html4/c414-flt-wrap-001.htm
  ▶ PASS [expected FAIL] /css21_dev/html4/floats-132.htm
  ▶ PASS [expected FAIL] /css21_dev/html4/floats-wrap-top-below-inline-002l.htm
  ▶ PASS [expected FAIL] /css21_dev/html4/floats-wrap-top-below-inline-002r.htm
  ▶ PASS [expected FAIL] /css21_dev/html4/floats-wrap-top-below-inline-003r.htm
  ▶ PASS [expected FAIL] /css21_dev/html4/floats-wrap-top-below-inline-003l.htm
  ▶ PASS [expected FAIL] /css21_dev/html4/inline-replaced-width-012.htm
  ▶ PASS [expected FAIL] /css21_dev/html4/inline-replaced-width-013.htm
  ▶ PASS [expected FAIL] /css21_dev/html4/inline-replaced-width-015.htm
  ▶ PASS [expected FAIL] /css21_dev/html4/c414-flt-wrap-001.htm

mbrubeck · 2016-04-19T17:23:27Z

components/layout/inline.rs

@@ -444,7 +444,7 @@ impl LineBreaker {
        // Initially, pretend a splittable fragment has zero inline-size. We will move it later if
        // it has nonzero inline-size and that causes problems.
        let placement_inline_size = if first_fragment.can_split() {
-            Au(0)
+            first_fragment.minimum_splittable_inline_size()


This fixes #6997.

Ms2ger · 2016-04-20T09:46:10Z

r? @mbrubeck

pcwalton · 2016-04-21T00:45:48Z

@bors-servo: try

bors-servo · 2016-04-21T00:46:00Z

⌛ Trying commit 6d06c6c with merge 6e6d0a1...


        Auto merge of #10691 - pcwalton:float-fixes, r=<try>

layout: Various fixes for floats. (NOT READY YET; DO NOT MERGE)  This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10691)

bors-servo · 2016-04-21T01:40:43Z

💔 Test failed - mac-rel-wpt

pcwalton · 2016-04-21T19:05:38Z

@bors-servo: try

bors-servo · 2016-04-21T19:05:40Z

⌛ Trying commit c909d81 with merge 0f41226...


        Auto merge of #10691 - pcwalton:float-fixes, r=<try>

layout: Rewrite the vertical alignment code to integrate properly with float placement. (NOT READY YET; DO NOT MERGE)  This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10691)

bors-servo · 2016-04-21T19:52:17Z

💔 Test failed - mac-rel-wpt

bors-servo · 2016-05-03T09:27:25Z

☔ The latest upstream changes (presumably #10979) made this pull request unmergeable. Please resolve the merge conflicts.


        layout: Speculate that the inline sizes of floats with percentage

inline sizes are nonzero. This is a bit of a hack.


        layout: Don't pretend inline fragment sizes are zero when placing them

between floats.


        layout: Check flow descendants of inline block fragments to find their

baselines when aligning inline fragments per CSS 2.1 § 10.8.1.


        layout: Consider vertical alignment of fragments during line breaking.

This makes the line breaker determine the final block positions of each line rather than doing it in a separate pass afterward. Not only does this simplify the code, it makes `vertical-align` and float placement interact properly.


        layout: Make the hypothetical box for `display: inline-block` with

`position: absolute` inline per CSS 2.1 § 10.3.7.


        layout: Include float information in flows' debug output.


        layout: Fix non-vertical-align-correct wording in a comment.


        layout: When printing out debug info for the float list, include

information about each float.


        layout: Minor whitespace cleanup.


        tests: Update test expectations.


        tests: Add a reftest to check that floats with percentage widths

properly push text down.


        tests: Fix the `input_buttons_margins_a.html` reftest.

It depends on the vertical alignment of button text, which is a spec bug.

pcwalton · 2016-05-04T20:43:51Z

@bors-servo: r=mbrubeck

Just updated a test (the test fails on Gecko without this fix)

bors-servo · 2016-05-04T20:43:52Z

📌 Commit dacc482 has been approved by mbrubeck

bors-servo · 2016-05-04T20:49:24Z

⌛ Testing commit dacc482 with merge 35ba293...


        Auto merge of #10691 - pcwalton:float-fixes, r=mbrubeck

layout: Fix float speculation with percentage inline sizes, rewrite vertical alignment, fix inline block ascent/descent computation, and fix absolute inline-block hypothetical boxes.  This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10691)

bors-servo · 2016-05-04T21:55:07Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows

paulrouget · 2016-05-07T08:38:03Z

regression: #11063

highfive assigned Ms2ger Apr 18, 2016

highfive added the S-awaiting-review label Apr 18, 2016

bors-servo added a commit that referenced this pull request Apr 18, 2016

Auto merge of #10691 - pcwalton:float-fixes, r=<try>

Loading status checks…

f992004

layout: Various fixes for floats. (NOT READY YET; DO NOT MERGE)

emilio reviewed Apr 18, 2016
View changes

highfive added the S-tests-failed label Apr 18, 2016

mbrubeck reviewed Apr 19, 2016
View changes

mbrubeck mentioned this pull request Apr 19, 2016

OOM in reddit search #6997

Closed

highfive assigned mbrubeck and unassigned Ms2ger Apr 20, 2016

highfive removed the S-tests-failed label Apr 21, 2016

pcwalton force-pushed the pcwalton:float-fixes branch from 55f7b2e to 6d06c6c Apr 21, 2016

highfive added the S-tests-failed label Apr 21, 2016

pcwalton changed the title ~~layout: Various fixes for floats. (NOT READY YET; DO NOT MERGE)~~ layout: Rewrite the vertical alignment code to integrate properly with float placement. (NOT READY YET; DO NOT MERGE) Apr 21, 2016

pcwalton force-pushed the pcwalton:float-fixes branch from 6d06c6c to c909d81 Apr 21, 2016

highfive removed the S-tests-failed label Apr 21, 2016

highfive added the S-tests-failed label Apr 21, 2016

highfive added the S-needs-rebase label May 3, 2016

pcwalton added 9 commits Apr 27, 2016

layout: Speculate that the inline sizes of floats with percentage

94306cd

inline sizes are nonzero. This is a bit of a hack.

layout: Don't pretend inline fragment sizes are zero when placing them

8823f87

between floats.

layout: Check flow descendants of inline block fragments to find their

04f0534

baselines when aligning inline fragments per CSS 2.1 § 10.8.1.

layout: Make the hypothetical box for `display: inline-block` with

9e1935c

`position: absolute` inline per CSS 2.1 § 10.3.7.

layout: Include float information in flows' debug output.

0198a9d

layout: Fix non-vertical-align-correct wording in a comment.

4ae6a68

layout: When printing out debug info for the float list, include

d2511e3

information about each float.

layout: Minor whitespace cleanup.

2bef560

pcwalton force-pushed the pcwalton:float-fixes branch from 332ad76 to dacc482 May 4, 2016

highfive removed the S-tests-failed label May 4, 2016

pcwalton added 3 commits Apr 27, 2016

tests: Update test expectations.

86314bd

tests: Add a reftest to check that floats with percentage widths

4227a69

properly push text down.

tests: Fix the `input_buttons_margins_a.html` reftest.

Loading status checks…

dacc482

It depends on the vertical alignment of button text, which is a spec bug.

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels May 4, 2016

highfive removed the S-awaiting-merge label May 4, 2016

notriddle mentioned this pull request May 4, 2016

Canvases elements have extraneous padding #10726

Open

pcwalton deleted the pcwalton:float-fixes branch May 4, 2016

paulrouget mentioned this pull request May 7, 2016

[regression] #10691 breaks the window buttons in browserhtml #11063

Closed

servo / servo

layout: Fix float speculation with percentage inline sizes, rewrite vertical alignment, fix inline block ascent/descent computation, and fix absolute inline-block hypothetical boxes. #10691

layout: Fix float speculation with percentage inline sizes, rewrite vertical alignment, fix inline block ascent/descent computation, and fix absolute inline-block hypothetical boxes. #10691

pcwalton commented Apr 18, 2016

highfive commented Apr 18, 2016

pcwalton commented Apr 18, 2016

bors-servo commented Apr 18, 2016

This comment has been minimized.

bors-servo commented Apr 18, 2016

emilio commented Apr 18, 2016 •

edited by mbrubeck

This comment has been minimized.

Ms2ger commented Apr 20, 2016

pcwalton commented Apr 21, 2016

bors-servo commented Apr 21, 2016

bors-servo commented Apr 21, 2016

pcwalton commented Apr 21, 2016

bors-servo commented Apr 21, 2016

bors-servo commented Apr 21, 2016

bors-servo commented May 3, 2016

pcwalton commented May 4, 2016

bors-servo commented May 4, 2016

bors-servo commented May 4, 2016

bors-servo commented May 4, 2016

paulrouget commented May 7, 2016

servo / servo

Join GitHub today

layout: Fix float speculation with percentage inline sizes, rewrite vertical alignment, fix inline block ascent/descent computation, and fix absolute inline-block hypothetical boxes. #10691

layout: Fix float speculation with percentage inline sizes, rewrite vertical alignment, fix inline block ascent/descent computation, and fix absolute inline-block hypothetical boxes. #10691

Conversation

pcwalton commented Apr 18, 2016

highfive commented Apr 18, 2016

pcwalton commented Apr 18, 2016

bors-servo commented Apr 18, 2016

This comment has been minimized.

emilio Apr 18, 2016 • edited by mbrubeck

bors-servo commented Apr 18, 2016

emilio commented Apr 18, 2016 • edited by mbrubeck

This comment has been minimized.

mbrubeck Apr 19, 2016

Ms2ger commented Apr 20, 2016

pcwalton commented Apr 21, 2016

bors-servo commented Apr 21, 2016

bors-servo commented Apr 21, 2016

pcwalton commented Apr 21, 2016

bors-servo commented Apr 21, 2016

bors-servo commented Apr 21, 2016

bors-servo commented May 3, 2016

pcwalton commented May 4, 2016

bors-servo commented May 4, 2016

bors-servo commented May 4, 2016

bors-servo commented May 4, 2016

paulrouget commented May 7, 2016

emilio Apr 18, 2016 •

edited by mbrubeck

emilio commented Apr 18, 2016 •

edited by mbrubeck