Bug 1507663 part 1: Uncomment/invert expectations in some reftests to now expect that contain:size *does not* interfere with baseline alignment. r=TYLin
authorDaniel Holbert <dholbert@cs.stanford.edu>
Mon, 26 Nov 2018 20:01:57 +0000
changeset 504580 2ca8fb2abe072be17cc89660485654fd1c5e8944
parent 504579 5318fe5c47e9bbe8de7a0beea7aabb1536d677a7
child 504581 1fe8baada2379546ccbd10b65db88812918655f5
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersTYLin
bugs1507663
milestone65.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 1507663 part 1: Uncomment/invert expectations in some reftests to now expect that contain:size *does not* interfere with baseline alignment. r=TYLin Differential Revision: https://phabricator.services.mozilla.com/D12614
layout/reftests/w3c-css/submitted/contain/contain-size-block-001.html
layout/reftests/w3c-css/submitted/contain/contain-size-multicol-003-ref.html
layout/reftests/w3c-css/submitted/contain/contain-size-multicol-003.html
--- a/layout/reftests/w3c-css/submitted/contain/contain-size-block-001.html
+++ b/layout/reftests/w3c-css/submitted/contain/contain-size-block-001.html
@@ -1,13 +1,13 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <meta charset="utf-8">
-  <title>CSS Test: 'contain: size' on block elements should cause them to be sized and baseline-aligned as if they had no contents.</title>
+  <title>CSS Test: 'contain: size' on block elements should cause them to be sized as if they had no contents</title>
   <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
   <link rel="help" href="https://drafts.csswg.org/css-contain/#containment-size">
   <link rel="match" href="contain-size-block-001-ref.html">
   <style>
   .contain {
     contain: size;
     border: 1em solid green;
     background: red;
--- a/layout/reftests/w3c-css/submitted/contain/contain-size-multicol-003-ref.html
+++ b/layout/reftests/w3c-css/submitted/contain/contain-size-multicol-003-ref.html
@@ -4,16 +4,21 @@
   <meta charset="utf-8">
   <title>CSS Reftest Reference</title>
   <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
   <style>
   .basic {
     border: 1em solid green;
     column-count: 3;
   }
+  .innerContents {
+    color: transparent;
+    height: 0;
+    width: 0;
+  }
   .col-width-ref {
     column-width: 20px;
   }
   .col-gap-ref {
     column-gap: 5px;
   }
   .flexBaselineCheck {
     display: flex;
@@ -23,22 +28,24 @@
     width: -moz-min-content;
   }
   .max {
     width: -moz-max-content;
   }
   </style>
 </head>
 <body>
-  <!-- XXX: This chunk needs to move to a separate test (Bug 1507663)
   <div class="flexBaselineCheck">
-  outside before<div class="basic"></div>outside after
+    outside before
+    <div class="basic" style="max-height:0px">
+      <div class="innerContents">inner</div>
+    </div>
+    outside after
   </div>
   <br>
-  -->
 
   <div class="basic min col-width-ref"></div>
   <br>
 
   <div class="basic max col-width-ref"></div>
   <br>
 
   <div class="basic min col-gap-ref col-width-ref"></div>
--- a/layout/reftests/w3c-css/submitted/contain/contain-size-multicol-003.html
+++ b/layout/reftests/w3c-css/submitted/contain/contain-size-multicol-003.html
@@ -1,13 +1,13 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <meta charset="utf-8">
-  <title>CSS Test: 'contain: size' on multicol elements should cause them to be sized and baseline-aligned as if they had no contents.</title>
+  <title>CSS Test: 'contain: size' on multicol elements should cause them to be sized as if they had no contents</title>
   <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
   <link rel="help" href="https://drafts.csswg.org/css-contain/#containment-size">
   <link rel="match" href="contain-size-multicol-003-ref.html">
   <style>
   .contain {
     contain: size;
     border: 1em solid green;
     background: red;
@@ -32,23 +32,26 @@
     width: -moz-min-content;
   }
   .max {
     width: -moz-max-content;
   }
   </style>
 </head>
 <body>
-  <!--CSS Test: A size-contained multicol element should perform baseline alignment as if it had no contents.-->
-  <!-- XXX: This chunk needs to move to a separate test (Bug 1507663)
+  <!-- This test verifies that contain:size doesn't interfere with the
+       determination of a multicol element's baseline. -->
   <div class="flexBaselineCheck">
-  outside before<div class="contain"><div class="innerContents">inner</div></div>outside after
+    outside before
+    <div class="contain">
+      <div class="innerContents">inner</div>
+    </div>
+    outside after
   </div>
   <br>
-  -->
 
   <!--The following tests are used to ensure column-gaps and column-widths continue to contribute to the minimum and maximum width of a size-contained multicol element. Each should render as if it had no contents.-->
 
   <div class="contain min col-width"><div class="innerContents">inner</div></div>
   <br>
 
   <div class="contain max col-width"><div class="innerContents">inner</div></div>
   <br>