Add support for inline-block and for computing min/max-content #25033

SimonSapin · 2019-12-03T14:13:19Z

No description provided.


        Implement "outer min/max-content" (based on a given min/max-content)

https://dbaron.org/css/intrinsic/#outer-intrinsic


        Add intrinsic size computation for inline formatting contexts


        Pass a LayoutContext through box construction


        Rename IntrinsicSizes to ContentSizes


        Add inline_size_is_auto


        Add a `request_content_sizes` parameter to `IndependentFormattingCont…

…ext::construct`


        Add a `Target` struct for `mapfold_reduce_into` call


        Add content sizes computation for block containers


        Add box construction for 'inline-block'…

… and other atomic inline-level boxes.


        Finish plumbing intrinsic min/max-content through box construction


        Remove IndependentFormattingContext::layout

Callers should handle replaced v.s. not separately


        Implement shrink-to-fit for abspos


        Add layout for 'inline-block' and other atomic inline-level boxes


        Rename ReplacedContent::layout to make_fragments and simplify its API

highfive · 2019-12-03T14:13:24Z

Heads up! This PR modifies the following files:

@jgraham: tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini, tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini
@emilio: components/style/values/computed/percentage.rs, components/style/values/computed/length.rs, components/style/values/generics/length.rs

jdm · 2019-12-03T14:19:59Z

r? @nox

nox

Lots of remarks but many of them are not that interesting.

components/layout_2020/flow/construct.rs

components/layout_2020/intrinsic.rs

components/layout_2020/flow/inline.rs

nox · 2019-12-04T10:44:02Z

components/layout_2020/flow/inline.rs

-struct InlineFormattingContextState<'box_tree, 'cb> {
-    containing_block: &'cb ContainingBlock,
+struct InlineFormattingContextState<'box_tree, 'a> {
+    absolutely_positioned_fragments: &'a mut Vec<AbsolutelyPositionedFragment<'box_tree>>,


Consider making this change separately from the implementation of inline-block so that its rationale is written in a commit message.

What change? This field is only added for the because layout code for inline-block needs to access it.

components/layout_2020/flow/inline.rs

nox · 2019-12-04T10:44:02Z

components/layout_2020/flow/inline.rs

+            // FIXME is this correct?
+            let dummy_tree_rank = 0;
+            // FIXME: Do we need to call `adjust_static_positions` somewhere near here?
+            let independent_layout = non_replaced.layout(
+                layout_context,
+                &containing_block_for_children,
+                dummy_tree_rank,
+                ifc.absolutely_positioned_fragments,
+            );


A dummy tree rank should only be used if this is an absolute containing block (i.e. a containing block in which absolutely positioned descendants should be placed relatively to).

That’s what I suspected. But I think line breaking makes it tricky to computed the correct rank, especially when we’ll add support for going “back” through an atomic inline-level to find the last wrap opportunity after overflowing a line.

components/layout_2020/positioned.rs


        Fix incorrect variable name

This was not the specified value


        Use `Sides::inline_sum` method


        Replace a pair of macros by methods


        Replace a large tuple return type with a new struct


        Review nits


        Replace boolean parameters by a new `ContentSizesRequest` enum


        Use a new `BoxContentSizes` enum instead of `Option<ContentSizes>`

SimonSapin · 2019-12-04T21:23:29Z

@bors-servo r=nox per IRC discussion

bors-servo · 2019-12-04T21:23:30Z

📌 Commit dd9dfc6 has been approved by nox

bors-servo · 2019-12-04T21:23:36Z

⌛ Testing commit dd9dfc6 with merge e70397d...


        Auto merge of #25033 - servo:intrinsic, r=nox

Add support for inline-block and for computing min/max-content

bors-servo · 2019-12-04T22:35:51Z

☀️ Test successful - status-taskcluster
Approved by: nox
Pushing e70397d to master...

bors-servo · 2019-12-04T22:35:51Z

☀️ Test successful - status-taskcluster
Approved by: nox
Pushing e70397d to master...

SimonSapin added 14 commits Dec 2, 2019

Implement "outer min/max-content" (based on a given min/max-content)

8fe37f3

https://dbaron.org/css/intrinsic/#outer-intrinsic

Add intrinsic size computation for inline formatting contexts

9c5a595

Pass a LayoutContext through box construction

4e6e31a

Rename IntrinsicSizes to ContentSizes

6a5b833

Add inline_size_is_auto

2c124b9

Add a `request_content_sizes` parameter to `IndependentFormattingCont…

cfdd23a

…ext::construct`

Add a `Target` struct for `mapfold_reduce_into` call

78bfa45

Add content sizes computation for block containers

303b36f

Add box construction for 'inline-block'…

da36fcd

… and other atomic inline-level boxes.

Finish plumbing intrinsic min/max-content through box construction

c056e5b

Remove IndependentFormattingContext::layout

efa1885

Callers should handle replaced v.s. not separately

Implement shrink-to-fit for abspos

46f0f7d

Add layout for 'inline-block' and other atomic inline-level boxes

b8db945

Rename ReplacedContent::layout to make_fragments and simplify its API

Loading status checks…

34e8cda

highfive assigned jdm Dec 3, 2019

highfive added the S-awaiting-review label Dec 3, 2019

highfive assigned nox and unassigned jdm Dec 3, 2019

nox reviewed Dec 4, 2019

View changes

SimonSapin added 7 commits Dec 4, 2019

Fix incorrect variable name

77d2c45

This was not the specified value

Use `Sides::inline_sum` method

01034b1

Replace a pair of macros by methods

038f83f

Replace a large tuple return type with a new struct

607df04

Review nits

Loading status checks…

6763e7e

Replace boolean parameters by a new `ContentSizesRequest` enum

Loading status checks…

38e8fd1

Use a new `BoxContentSizes` enum instead of `Option<ContentSizes>`

Loading status checks…

dd9dfc6

highfive added S-awaiting-merge and removed S-awaiting-review labels Dec 4, 2019

bors-servo merged commit dd9dfc6 into master Dec 4, 2019
2 checks passed

2 checks passed

Community-TC (pull_request) TaskGroup: success
Details

homu Test successful
Details

bors-servo deleted the intrinsic branch Dec 4, 2019

highfive removed the S-awaiting-merge label Dec 4, 2019

SimonSapin added the A-layout/2020 label Dec 6, 2019

SimonSapin added this to Done / resolved in Layout 2020 Dec 6, 2019

servo / servo

Add support for inline-block and for computing min/max-content #25033

Add support for inline-block and for computing min/max-content #25033

SimonSapin commented Dec 3, 2019

highfive commented Dec 3, 2019

jdm commented Dec 3, 2019

nox left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

SimonSapin commented Dec 4, 2019

bors-servo commented Dec 4, 2019

bors-servo commented Dec 4, 2019

bors-servo commented Dec 4, 2019

bors-servo commented Dec 4, 2019

servo / servo

Join GitHub today

Add support for inline-block and for computing min/max-content #25033

Add support for inline-block and for computing min/max-content #25033

Conversation

SimonSapin commented Dec 3, 2019

highfive commented Dec 3, 2019

jdm commented Dec 3, 2019

nox left a comment

This comment has been minimized.

nox Dec 4, 2019

This comment has been minimized.

SimonSapin Dec 4, 2019

This comment has been minimized.

nox Dec 4, 2019

This comment has been minimized.

SimonSapin Dec 4, 2019

SimonSapin commented Dec 4, 2019

bors-servo commented Dec 4, 2019

bors-servo commented Dec 4, 2019

bors-servo commented Dec 4, 2019

bors-servo commented Dec 4, 2019