mirror of
https://github.com/servo/servo.git
synced 2025-08-09 07:25:35 +01:00
Auto merge of #29594 - delan:minmax-positioned, r=mrobinson
Handle min/max sizes in non-replaced positioned boxes This patch makes HoistedAbsolutelyPositionedBox handle min/max sizes in the non-replaced case, per CSS2 [#min-max-widths](https://drafts.csswg.org/css2/#min-max-widths) and [#min-max-heights](https://drafts.csswg.org/css2/#min-max-heights). No changes are made to the replaced case. 3 new tests: * /css/CSS2/positioning/absolute-non-replaced-max-001.html (fails under layout 2013) * /css/CSS2/positioning/absolute-non-replaced-min-001.html (fails under layout 2013) * /css/CSS2/positioning/absolute-non-replaced-min-max-001.html (passes under layout 2013) 13 tests now pass: * [/css/CSS2/positioning/absolute-non-replaced-max-height-002.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-max-height-002.xht) * [/css/CSS2/positioning/absolute-non-replaced-max-height-003.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-max-height-003.xht) * [/css/CSS2/positioning/absolute-non-replaced-max-height-007.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-max-height-007.xht) * [/css/CSS2/positioning/absolute-non-replaced-max-height-008.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-max-height-008.xht) * [/css/CSS2/positioning/absolute-non-replaced-max-height-009.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-max-height-009.xht) * [/css/CSS2/positioning/absolute-non-replaced-max-height-011.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-max-height-011.xht) * [/css/CSS2/positioning/absolute-non-replaced-width-025.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-width-025.xht) * [/css/CSS2/positioning/absolute-non-replaced-width-026.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-width-026.xht) * [/css/CSS2/positioning/abspos-change-in-inline-block.html](https://wpt.live/css/CSS2/positioning/abspos-change-in-inline-block.html) * [/css/CSS2/positioning/abspos-width-change-inline-container-001.html](https://wpt.live/css/CSS2/positioning/abspos-width-change-inline-container-001.html) * [/css/CSS2/positioning/detach-abspos-before-layout.html](https://wpt.live/css/CSS2/positioning/detach-abspos-before-layout.html) * [/css/CSS2/positioning/relpos-percentage-left-in-scrollable-2.html](https://wpt.live/css/CSS2/positioning/relpos-percentage-left-in-scrollable-2.html) * [/css/CSS2/positioning/relpos-percentage-left-in-scrollable.html](https://wpt.live/css/CSS2/positioning/relpos-percentage-left-in-scrollable.html) 11 tests would now pass if `<br>` was inserted between the two `<img>` tags in the reference (#29591): * [/css/CSS2/positioning/absolute-non-replaced-height-003.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-height-003.xht) * [/css/CSS2/positioning/absolute-non-replaced-height-004.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-height-004.xht) * [/css/CSS2/positioning/absolute-non-replaced-height-005.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-height-005.xht) * [/css/CSS2/positioning/absolute-non-replaced-height-010.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-height-010.xht) * [/css/CSS2/positioning/absolute-non-replaced-height-011.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-height-011.xht) * [/css/CSS2/positioning/absolute-non-replaced-height-012.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-height-012.xht) * [/css/CSS2/positioning/absolute-non-replaced-max-height-004.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-max-height-004.xht) * [/css/CSS2/positioning/absolute-non-replaced-max-height-005.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-max-height-005.xht) * [/css/CSS2/positioning/absolute-non-replaced-max-height-006.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-max-height-006.xht) * [/css/CSS2/positioning/absolute-non-replaced-max-height-010.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-max-height-010.xht) * [/css/CSS2/positioning/absolute-non-replaced-max-height-012.xht](https://wpt.live/css/CSS2/positioning/absolute-non-replaced-max-height-012.xht) 1 test continues to fail, but the expectation was out of date: * [/css/CSS2/positioning/relpos-percentage-top-in-scrollable.html](https://wpt.live/css/CSS2/positioning/relpos-percentage-top-in-scrollable.html) --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [x] These changes contribute to #29592 <!-- Either: --> - [x] There are tests for these changes OR - [ ] These changes do not require tests because ___
This commit is contained in:
bors-servo
GitHub
commit
39ba7fbb94
34 changed files with 240 additions and 113 deletions
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-height-003.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-height-004.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-height-005.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-height-010.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-height-011.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-height-012.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-max-height-002.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-max-height-003.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-max-height-004.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-max-height-005.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-max-height-006.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-max-height-007.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-max-height-008.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-max-height-009.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-max-height-010.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-max-height-011.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-max-height-012.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-width-025.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[absolute-non-replaced-width-026.xht]
|
||||
expected: FAIL
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
[abspos-change-in-inline-block.html]
|
||||
[No crash]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[abspos-width-change-inline-container-001.html]
|
||||
expected: FAIL
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
[detach-abspos-before-layout.html]
|
||||
[No crash or DCHECK failure]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[relpos-percentage-left-in-scrollable-2.html]
|
||||
expected: ERROR
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
[relpos-percentage-left-in-scrollable.html]
|
||||
expected: ERROR
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
[relpos-percentage-top-in-scrollable.html]
|
||||
expected: ERROR
|
||||
[Top percentage resolved correctly for overflow contribution]
|
||||
expected: FAIL
|
||||
|
|
|
|||
|
|
@ -91454,6 +91454,19 @@
|
|||
{}
|
||||
]
|
||||
],
|
||||
"absolute-non-replaced-max-001.html": [
|
||||
"4b208c5831e1b36a3c503129562175457ef41c0b",
|
||||
[
|
||||
null,
|
||||
[
|
||||
[
|
||||
"/css/CSS2/positioning/absolute-non-replaced-max-001-ref.html",
|
||||
"=="
|
||||
]
|
||||
],
|
||||
{}
|
||||
]
|
||||
],
|
||||
"absolute-non-replaced-max-height-002.xht": [
|
||||
"7637068a9c4a2cc584acfa329d5aabb09e7101ab",
|
||||
[
|
||||
|
|
@ -91597,6 +91610,32 @@
|
|||
{}
|
||||
]
|
||||
],
|
||||
"absolute-non-replaced-min-001.html": [
|
||||
"0e6d17661e39beb872f886eba06acf47be9a931c",
|
||||
[
|
||||
null,
|
||||
[
|
||||
[
|
||||
"/css/CSS2/positioning/absolute-non-replaced-min-max-001-ref.html",
|
||||
"=="
|
||||
]
|
||||
],
|
||||
{}
|
||||
]
|
||||
],
|
||||
"absolute-non-replaced-min-max-001.html": [
|
||||
"2e240b7509adc3bd8cb9cae67165e0dc42296e07",
|
||||
[
|
||||
null,
|
||||
[
|
||||
[
|
||||
"/css/CSS2/positioning/absolute-non-replaced-min-max-001-ref.html",
|
||||
"=="
|
||||
]
|
||||
],
|
||||
{}
|
||||
]
|
||||
],
|
||||
"absolute-non-replaced-width-001.xht": [
|
||||
"6d2b8a33a0db793d9e52e94b33aa1c95884a2dbe",
|
||||
[
|
||||
|
|
@ -360169,6 +360208,10 @@
|
|||
"51ec44e9cf55daa92b0822590933275a6706b9aa",
|
||||
[]
|
||||
],
|
||||
"absolute-non-replaced-max-001-ref.html": [
|
||||
"742b3063abd693a543ca4ce88bda161ae04d8668",
|
||||
[]
|
||||
],
|
||||
"absolute-non-replaced-max-height-002-ref.xht": [
|
||||
"75b0e54b442a868bfd5b86c671cbb8b67211c800",
|
||||
[]
|
||||
|
|
@ -360189,6 +360232,10 @@
|
|||
"aea00aaa43cbb10e905796731278e68f1033e428",
|
||||
[]
|
||||
],
|
||||
"absolute-non-replaced-min-max-001-ref.html": [
|
||||
"3bbba2be908c099806ffdaaca440cf4513e1e92b",
|
||||
[]
|
||||
],
|
||||
"absolute-non-replaced-width-002-ref.xht": [
|
||||
"e88ac8098391299e2e106a831fb02f22e7eff9c8",
|
||||
[]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
[absolute-non-replaced-max-001.html]
|
||||
expected: FAIL
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
[absolute-non-replaced-min-001.html]
|
||||
expected: FAIL
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
<!doctype html>
|
||||
<meta charset="utf-8">
|
||||
<link rel="author" name="Delan Azabani" href="mailto:dazabani@igalia.com">
|
||||
<p>Test passes if there is a green square containing a smaller black square below.
|
||||
<div style="width: 2em; height: 2em; background: green;">
|
||||
<div style="width: 1em; height: 1em; background: black;"></div>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
<!doctype html>
|
||||
<meta charset="utf-8">
|
||||
<title>CSS Test: ‘max-width’ and ‘max-height’ affect percentage sizes in descendants</title>
|
||||
<link rel="author" name="Delan Azabani" href="mailto:dazabani@igalia.com">
|
||||
<link rel="help" href="https://drafts.csswg.org/css2/#min-max-widths">
|
||||
<link rel="help" href="https://drafts.csswg.org/css2/#min-max-heights">
|
||||
<link rel="match" href="absolute-non-replaced-max-001-ref.html">
|
||||
<meta name="assert" value="This test verifies that when the used ‘width’ and ‘height’ are affected by ‘max-width’ and ‘max-height’, the descendants are laid out with a containing block of the new size, so any percentage sizes are resolved against that new size.">
|
||||
<p>Test passes if there is a green square containing a smaller black square below.
|
||||
<div style="position: absolute; width: 4em; height: 4em; max-width: 2em; max-height: 2em; background: green;">
|
||||
<div style="width: 50%; height: 50%; background: black;"></div>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
<!doctype html>
|
||||
<meta charset="utf-8">
|
||||
<title>CSS Test: ‘min-width’ and ‘min-height’ affect percentage sizes in descendants</title>
|
||||
<link rel="author" name="Delan Azabani" href="mailto:dazabani@igalia.com">
|
||||
<link rel="help" href="https://drafts.csswg.org/css2/#min-max-widths">
|
||||
<link rel="help" href="https://drafts.csswg.org/css2/#min-max-heights">
|
||||
<link rel="match" href="absolute-non-replaced-min-max-001-ref.html">
|
||||
<meta name="assert" value="This test verifies that when the used ‘width’ and ‘height’ are affected by ‘min-width’ and ‘min-height’, the descendants are laid out with a containing block of the new size, so any percentage sizes are resolved against that new size.">
|
||||
<p>Test passes if there is a green square below.
|
||||
<div style="position: absolute; width: 0; height: 0; min-width: 1em; min-height: 1em; background: black;">
|
||||
<div style="width: 100%; height: 100%; background: green;"></div>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
<!doctype html>
|
||||
<meta charset="utf-8">
|
||||
<link rel="author" name="Delan Azabani" href="mailto:dazabani@igalia.com">
|
||||
<p>Test passes if there is a green square below.
|
||||
<div style="width: 1em; height: 1em; background: green;"></div>
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
<!doctype html>
|
||||
<meta charset="utf-8">
|
||||
<title>CSS Test: ‘min-width’ and ‘min-height’ take precedence over ‘max-width’ and ‘max-height’ when contradictory</title>
|
||||
<link rel="author" name="Delan Azabani" href="mailto:dazabani@igalia.com">
|
||||
<link rel="help" href="https://drafts.csswg.org/css2/#min-max-widths">
|
||||
<link rel="help" href="https://drafts.csswg.org/css2/#min-max-heights">
|
||||
<link rel="match" href="absolute-non-replaced-min-max-001-ref.html">
|
||||
<meta name="assert" value="This test verifies that when ‘min-width’ is greater than ‘max-width’, or ‘min-height’ is greater than ‘max-height’, the minimums take precedence, because the steps that recalculate sizes and margins for the minimums (step 3) come after the steps for the maximums (step 2).">
|
||||
<p>Test passes if there is a green square below.
|
||||
<div style="position: absolute; width: 0; height: 0; min-width: 1em; min-height: 1em; max-width: 0; max-height: 0; background: green;"></div>
|
||||
Loading…
Add table
Add a link
Reference in a new issue