layout: Disallow margins from collapsing through blocks with clearance

per CSS 2.1 § 8.3.1. Fixes the test failure in #10458.
2026-04-29 02:47:55 +02:00 · 2016-04-12 14:09:29 -07:00
parent e32455f7b8
commit a3fd226341
37 changed files with 223 additions and 94 deletions
--- a/tests/wpt/metadata-css/css21_dev/html4/adjacent-floats-001.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/adjacent-floats-001.htm.ini
@@ -1,3 +0,0 @@
-[adjacent-floats-001.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/bidi-010b.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/bidi-010b.htm.ini
@@ -0,0 +1,4 @@
+[bidi-010b.htm]
+  type: reftest
+  disabled: intermittent failure on reference, starting from PR #10458
+
--- a/tests/wpt/metadata-css/css21_dev/html4/border-right-color-175.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/border-right-color-175.htm.ini
@@ -1,3 +0,0 @@
-[border-right-color-175.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-002.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-002.htm.ini
@@ -1,3 +0,0 @@
-[c414-flt-fit-002.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-003.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-003.htm.ini
@@ -1,3 +0,0 @@
-[c414-flt-fit-003.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-004.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-004.htm.ini
@@ -1,3 +0,0 @@
-[c414-flt-fit-004.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-005.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-005.htm.ini
@@ -1,3 +0,0 @@
-[c414-flt-fit-005.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-006.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-006.htm.ini
@@ -1,3 +0,0 @@
-[c414-flt-fit-006.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/clear-002.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/clear-002.htm.ini
@@ -1,3 +0,0 @@
-[clear-002.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/clear-float-004.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/clear-float-004.htm.ini
@@ -1,3 +0,0 @@
-[clear-float-004.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/clear-float-005.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/clear-float-005.htm.ini
@@ -1,3 +0,0 @@
-[clear-float-005.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/clear-float-006.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/clear-float-006.htm.ini
@@ -1,3 +0,0 @@
-[clear-float-006.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/clear-float-007.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/clear-float-007.htm.ini
@@ -1,3 +0,0 @@
-[clear-float-007.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/clear-float-008.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/clear-float-008.htm.ini
@@ -1,3 +0,0 @@
-[clear-float-008.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/clear-float-009.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/clear-float-009.htm.ini
@@ -1,3 +0,0 @@
-[clear-float-009.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/float-006.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/float-006.htm.ini
@@ -1,3 +0,0 @@
-[float-006.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-009.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-009.htm.ini
@@ -1,3 +0,0 @@
-[float-applies-to-009.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-012.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-012.htm.ini
@@ -1,3 +0,0 @@
-[float-applies-to-012.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/float-non-replaced-height-001.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/float-non-replaced-height-001.htm.ini
@@ -1,3 +0,0 @@
-[float-non-replaced-height-001.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-003.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/floats-003.htm.ini
@@ -1,3 +0,0 @@
-[floats-003.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-004.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/floats-004.htm.ini
@@ -1,3 +0,0 @@
-[floats-004.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-123.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/floats-123.htm.ini
@@ -1,3 +0,0 @@
-[floats-123.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-141.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/floats-141.htm.ini
@@ -1,3 +0,0 @@
-[floats-141.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-144.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/floats-144.htm.ini
@@ -1,3 +0,0 @@
-[floats-144.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-145.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/floats-145.htm.ini
@@ -1,3 +1,3 @@
 [floats-145.htm]
  type: reftest
-  expected: FAIL
+  disabled: depends on unspecified line-height behavior, see PR #10458
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-146.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/floats-146.htm.ini
@@ -1,3 +0,0 @@
-[floats-146.htm]
-  type: reftest
-  expected: FAIL
--- a/tests/wpt/metadata-css/css21_dev/html4/position-absolute-007.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/position-absolute-007.htm.ini
@@ -1,3 +0,0 @@
-[position-absolute-007.htm]
-  type: reftest
-  expected: FAIL