Bug 1485046 [wpt PR 12596] - Sync Mozilla CSS tests as of 2018-08-21, a=testonly
authorL. David Baron <dbaron@dbaron.org>
Fri, 24 Aug 2018 12:54:23 +0000
changeset 491581 b0ff3d28ea4d5e3ecab112c274e9c5b91664f846
parent 491580 d2d1daf7c2c676f42967c55877599c63ad8fea69
child 491582 a4f00f704de791ab8956bf124a29a06966f67e8d
push id1815
push userffxbld-merge
push dateMon, 15 Oct 2018 10:40:45 +0000
treeherdermozilla-release@18d4c09e9378 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1485046, 12596, 1481951
milestone63.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 1485046 [wpt PR 12596] - Sync Mozilla CSS tests as of 2018-08-21, a=testonly Automatic update from web-platform-testsSync Mozilla tests as of https://hg.mozilla.org/mozilla-central/rev/a955df76e2b636889a1c37a7863739d6306520eb . This contains only changes from [bug 1481951](https://bugzilla.mozilla.org/show_bug.cgi?id=1481951), by @dholbert, reviewed by me. -- wpt-commits: f93b9e7f735ba39297971483c4ceccbbbf216249 wpt-pr: 12596
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002-ref.html
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002.html
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -572455,29 +572455,29 @@
    "46f028c0581fe1375d58c04b73642ac731644ee7",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-003.html": [
    "d40a02115665782b81d14e6c3d5e5b0c5f38690a",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001-ref.html": [
-   "400369b763bd87d7b9de5a66923e6c12a2bc3a3f",
+   "61825fd45415a08b90f824895093f47650e24c32",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001.html": [
-   "e4330eca96de05996b750d3224aecb83ee3797e4",
+   "5bf984e2bf12263526165048c4aeb0e9236c5bbb",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002-ref.html": [
-   "e35eb9b2b748d1e8ab8b62f244a1f3a0e8db42f4",
+   "ba1c600d504be3ec0496d1513e152a90f6eecbc2",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002.html": [
-   "aa02bcd73a63106d6cc40233b9c35e11984845f7",
+   "4929dc5d33e760503c9a7d98d6adbafa3f07637a",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-stacking-context-001.html": [
    "4ec3bcee6fdf7d46f076ddf460c8081d9b19e8ee",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-paint-clip-001-ref.html": [
    "629cb939e01329ae1f9613876f050777b1d5b011",
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001-ref.html
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001-ref.html
@@ -12,21 +12,16 @@
   .auto {
     overflow: auto;
   }
   .inner-sm {
     height: 50px;
     width: 50px;
     background: lightblue;
   }
-  .inner-md {
-    height: 100px;
-    width: 100px;
-    background: lightblue;
-  }
   .inner-lg-1 {
     height: 95px;
     width: 95px;
     background: lightblue;
   }
   .inner-lg-2 {
     height: 200px;
     width: 200px;
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001.html
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001.html
@@ -18,21 +18,16 @@
   .auto {
     overflow: auto;
   }
   .inner-sm {
     height: 50px;
     width: 50px;
     background: lightblue;
   }
-  .inner-md {
-    height: 100px;
-    width: 100px;
-    background: lightblue;
-  }
   .inner-lg {
     height: 200px;
     width: 200px;
     background: lightblue;
   }
   .pass {
     background: green;
   }
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002-ref.html
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002-ref.html
@@ -12,21 +12,16 @@
   .auto {
     overflow: auto;
   }
   .inner-sm {
     height: 50px;
     width: 50px;
     background: lightblue;
   }
-  .inner-md {
-    height: 100px;
-    width: 100px;
-    background: lightblue;
-  }
   .inner-lg-1 {
     height: 95px;
     width: 95px;
     float:left;
     background: lightblue;
   }
   .inner-lg-2 {
     height: 200px;
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002.html
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002.html
@@ -1,73 +1,67 @@
 
 <!DOCTYPE HTML>
 <html>
 <head>
   <meta charset="utf-8">
-  <title>CSS Test: 'contain: layout' should force all overflow to be ink overflow.</title>
+  <title>CSS Test: 'contain: layout' should force all overflow to be ink overflow (including when the overflow comes from floated descendants)</title>
   <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
   <link rel="help" href="https://drafts.csswg.org/css-contain/#containment-layout">
   <link rel="match" href="contain-layout-overflow-002-ref.html">
   <style>
   .contain {
     contain: layout;
   }
+  .float { float: left; }
   .outer {
     height: 100px;
     width: 100px;
   }
   .auto {
     overflow: auto;
   }
   .inner-sm {
     height: 50px;
     width: 50px;
     background: lightblue;
   }
-  .inner-md {
-    height: 100px;
-    width: 100px;
-    background: lightblue;
-  }
   .inner-lg {
     height: 200px;
     width: 200px;
     background: lightblue;
-    float: left;
   }
   .pass {
     background: green;
   }
   .fail {
     background: red;
   }
   .border {
     border: 5px solid green;
   }
   </style>
 </head>
 <body>
   <!--CSS Test: Elements with contain:layout that do not produce scrollable overflow should paint as if containment were not applied. -->
   <div class="outer">
-    <div class="inner-sm contain" style="float:left;"></div>
+    <div class="inner-sm contain float"></div>
   </div>
   <br>
 
   <!--CSS Test: Layout-contained elements that overflow their container and have children who overflow should produce the same amount of scrollable overflow as if there were no children. -->
   <div class="outer auto">
-    <div class="outer contain">
-      <div class="inner-lg pass"></div>
-      <div class="inner-lg fail"></div>
+    <div class="inner-lg contain">
+      <div class="inner-lg pass float"></div>
+      <div class="inner-lg fail float"></div>
     </div>
   </div>
   <br>
 
-
   <!--CSS Test: Layout-contained elements that do not overflow their container, but have children who overflow, should not allow their children to affect the scrollable overflow regions of their parent. -->
   <div class="outer auto">
     <div class="inner-sm contain border">
-      <div class="inner-lg">
+      <div class="inner-lg float">
       </div>
     </div>
   </div>
 </body>
 </html>