Skip to content

Commit 60ff1c2

Browse files
committed
[css-layout-api] Fix layout() linking, and remove inline-layout()
1 parent a6df616 commit 60ff1c2

File tree

1 file changed

+12
-21
lines changed

1 file changed

+12
-21
lines changed

css-layout-api/Overview.bs

+12-21
Original file line numberDiff line numberDiff line change
@@ -88,21 +88,18 @@ Layout API Containers {#layout-api-containers}
8888
==============================================
8989

9090
<pre class="propdef">
91-
Name: display
92-
New values: layout(<<ident>>) | inline-layout(<<ident>>)
91+
Name: <<display-inside>>
92+
New values: layout(<<ident>>)
9393
</pre>
9494

9595
<dl dfn-for="display" dfn-type=value>
9696
<dt><dfn>layout()</dfn>
9797
<dd>
98-
This value causes an element to generate a block-level <a>layout API container</a> box.
99-
<dt><dfn>inline-layout()</dfn>
100-
<dd>
101-
This value causes an element to generate an inline-level <a>layout API container</a> box.
98+
This value causes an element to generate a <a>layout API container</a> box.
10299
</dl>
103100

104-
A <dfn>layout API container</dfn> is the box generated by an element with a computed 'display' of
105-
''layout()'' or ''inline-layout()''.
101+
A <dfn>layout API container</dfn> is the box generated by an element with a <<display-inside>>
102+
<a>computed value</a> ''layout()''.
106103

107104
A <a>layout API container</a> establishes a new <dfn>layout API formatting context</dfn> for its
108105
contents. This is the same as establishing a block formatting context, except that the layout
@@ -124,12 +121,6 @@ As the layout is entirely up to the author, properties which are used in other l
124121
flex, block) may not apply. For example an author may not call respect the 'width' or 'height'
125122
properties.
126123

127-
If an element's specified 'display' is ''inline-layout()'', then its 'display' property computes to
128-
''layout()'' in certain circumstances: the table in <a
129-
href="https://www.w3.org/TR/CSS2/visuren.html#dis-pos-flo">CSS 2.1 Section 9.7</a> is amended to
130-
contain an additional row, with ''inline-layout()'' in the "Specified Value" column and ''layout()''
131-
in the "Computed Value" column.
132-
133124
A <a>layout API container</a> has a <dfn>layout instance</dfn>, initially this is set to null. This
134125
is an instance of the author defined layout class (see [[#registering-layout]]). If the <a>box</a>'s
135126
<a>computed value</a> of 'display' changes, this must be reset to null.
@@ -785,9 +776,9 @@ TODO comments. <dfn>intrinsic sizes valid flag</dfn>. <dfn>intrinsic-sizes-valid
785776
Issue: The above flag is too restrictive on user agents, change.
786777

787778
When the computed style for a |box| changes, the user agent must run the following steps:
788-
1. Let |layoutFunction| be the <<layout()>> or <<inline-layout()>> function of the 'display'
789-
property on the computed style for the |box| if it exists. If it is a different type of
790-
value (e.g. ''grid'') then abort all these steps.
779+
1. Let |layoutFunction| be the ''layout()'' function of the 'display' property on the computed
780+
style for the |box| if it exists. If it is a different type of value (e.g. ''grid'') then
781+
abort all these steps.
791782

792783
2. Let |name| be the first argument of the |layoutFunction|.
793784

@@ -816,7 +807,7 @@ Concepts {#concepts}
816807

817808
A <dfn>layout definition</dfn> is a <a>struct</a> which describes the information needed by the
818809
{{LayoutWorkletGlobalScope}} about hte author defined layout (which can be referenced by the
819-
<<layout()>> function). It consists of:
810+
''layout()'' function). It consists of:
820811

821812
- <dfn for="layout definition">class constructor</dfn> which is the class <a>constructor</a>.
822813

@@ -837,7 +828,7 @@ A <dfn>layout definition</dfn> is a <a>struct</a> which describes the informatio
837828
- <dfn for="layout definition">child display</dfn> a {{ChildDisplayType}}.
838829

839830
A <dfn>document layout definition</dfn> is a <a>struct</a> which describes the information needed by
840-
the <a>document</a> about the author defined layout (which can be referenced by the <<layout()>>
831+
the <a>document</a> about the author defined layout (which can be referenced by the ''layout()''
841832
function). It consists of:
842833

843834
- <dfn for="document layout definition">input properties</dfn> which is a <a>list</a> of
@@ -1158,7 +1149,7 @@ Note: The <a>determine the intrinsic sizes</a> algorithm allows for user agents
11581149
When the user agent wants to <dfn>determine the intrinsic sizes</dfn> of a <a>layout API formatting
11591150
context</a> for a given |box|, |childBoxes| it <em>must</em> run the following steps:
11601151

1161-
1. Let |layoutFunction| be the <<layout()>> for the <a>computed value</a> of <<display-inside>>
1152+
1. Let |layoutFunction| be the ''layout()'' for the <a>computed value</a> of <<display-inside>>
11621153
for |box|.
11631154

11641155
2. If the <a>intrinsic sizes valid flag</a> for the |layoutFunction| is
@@ -1275,7 +1266,7 @@ When the user agent wants to <dfn>generate a fragment</dfn> of a <a>layout API f
12751266
context</a> for a given |box|, |childBoxes|, |internalConstraintSpace|, and an optional
12761267
|internalBreakToken| it <em>must</em> run the following steps:
12771268

1278-
1. Let |layoutFunction| be the <<layout()>> for the <a>computed value</a> of <<display-inside>>
1269+
1. Let |layoutFunction| be the ''layout()'' for the <a>computed value</a> of <<display-inside>>
12791270
for |box|.
12801271

12811272
2. If the <a>layout valid flag</a> for the |layoutFunction| is <a>layout-valid</a> the user

0 commit comments

Comments
 (0)