Bug 1496275 - Fix wpt test multicol-span-all-margin-bottom-001-ref.xht. r=dbaron
authorTing-Yu Lin <tlin@mozilla.com>
Thu, 04 Oct 2018 17:28:52 +0000
changeset 495384 2f3ac50f1ce9fb8c9add3390085843975a5be10d
parent 495383 a816c74a4f6b01d9d87e627d0c72e938b597e460
child 495385 274c5774f6fb762d3124b11dd21824edf2d1301a
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs1496275
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1496275 - Fix wpt test multicol-span-all-margin-bottom-001-ref.xht. r=dbaron Per example in the spec https://drafts.csswg.org/css-multicol-1/#column-span ... the bottom margin of the second spanner does not collapse with the top margin of the subsequent element. Likewise, in the test file multicol-span-all-margin-bottom-001.xht, the bottom margin of the black spanner <h4> should not collapse with the top margin of the orange non-spanner <h4>. Differential Revision: https://phabricator.services.mozilla.com/D7670
testing/web-platform/tests/css/css-multicol/multicol-span-all-margin-bottom-001-ref.xht
testing/web-platform/tests/css/css-multicol/multicol-span-all-margin-bottom-001.xht
--- a/testing/web-platform/tests/css/css-multicol/multicol-span-all-margin-bottom-001-ref.xht
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-margin-bottom-001-ref.xht
@@ -17,15 +17,15 @@
  </head>
  <body>
 
   <div>
     <img src="support/swatch-navy.png" width="160" height="40" alt="Image download support must be enabled" />
     <img src="support/swatch-yellow.png" width="160" height="20" alt="Image download support must be enabled" />
     <img src="support/black20x20.png" width="160" height="20" alt="Image download support must be enabled" />
     <img src="support/swatch-yellow.png" width="160" height="20" alt="Image download support must be enabled" />
+    <img src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/swatch-pink.png" width="40" height="20" alt="Image download support must be enabled" />
     <img src="support/swatch-orange.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-pink.png" width="80" height="20" alt="Image download support must be enabled" />
     <img src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-pink.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" />
-    <img src="support/swatch-blue.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/swatch-pink.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" />
   </div>
 
  </body>
 </html>
--- a/testing/web-platform/tests/css/css-multicol/multicol-span-all-margin-bottom-001.xht
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-margin-bottom-001.xht
@@ -45,20 +45,20 @@
   }
 
   h4#orange
   {
   background: orange;
   color: orange;
   /*
   In this test, the glyphs "or" are painted into 1st column box.
-  "Content in the normal flow that extends into column
-  gaps (e.g., long words or images) is clipped in the
-  middle of the column gap."
-  Therefore, the glyphs "ang" are clipped and not painted.
+  Per spec, content in the normal flow that extends into column
+  gaps (e.g., long words or images) is not clipped to the column
+  box. However, the glyphs "ang" are overwritten by <span>s, so
+  they're not visible.
   */
   }
 
   span {color: blue;}
 
   span + span {color: pink;}
   ]]></style>
  </head>