Bug 1382944 - Allow an assertion in test_display_mode.html and test_display_mode_reflow.html on stylo. r?heycam draft
authorHiroyuki Ikezoe <hikezoe@mozilla.com>
Fri, 21 Jul 2017 15:57:17 +0900
changeset 612907 a76a78e0cc122badf92f49d4a5ed34fd15dfed79
parent 612906 bfeea9fdf02f5d4a3063162b6987b7c88ce8c19b
child 638532 e213c532a5f4231603eaec030d846639fe786e8c
push id69636
push userhikezoe@mozilla.com
push dateFri, 21 Jul 2017 06:57:41 +0000
reviewersheycam
bugs1382944
milestone56.0a1
Bug 1382944 - Allow an assertion in test_display_mode.html and test_display_mode_reflow.html on stylo. r?heycam A change[1] for browser triggered an assertion 'inline-size less than zero: 'aContainingBlockISize >= 0' in ReflowInput::CalculateHypotheticalPosition, we allow the assertion for now and will fix it later in another bug. [1] https://hg.mozilla.org/integration/autoland/rev/d4b7fc921b88a8416c656e3ee6a893479b463fc4 MozReview-Commit-ID: D7KoROcS2T5
layout/style/test/chrome/test_display_mode.html
layout/style/test/chrome/test_display_mode_reflow.html
--- a/layout/style/test/chrome/test_display_mode.html
+++ b/layout/style/test/chrome/test_display_mode.html
@@ -10,16 +10,19 @@ https://bugzilla.mozilla.org/show_bug.cg
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://global/skin"/>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <script type="application/javascript">
 
 /** Test for Display Mode **/
 SimpleTest.waitForExplicitFinish();
+if (SpecialPowers.getBoolPref('layout.css.servo.enabled')) {
+  SimpleTest.expectAssertions(1);
+}
 Components.utils.import("resource://gre/modules/Services.jsm");
 
 function waitOneEvent(element, name) {
   return new Promise(function(resolve, reject) {
     element.addEventListener(name, function() {
       resolve();
     }, {once: true});
   });
--- a/layout/style/test/chrome/test_display_mode_reflow.html
+++ b/layout/style/test/chrome/test_display_mode_reflow.html
@@ -10,16 +10,19 @@ https://bugzilla.mozilla.org/show_bug.cg
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://global/skin"/>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <script type="application/javascript">
 
 /** Test for Display Mode **/
 SimpleTest.waitForExplicitFinish();
+if (SpecialPowers.getBoolPref('layout.css.servo.enabled')) {
+  SimpleTest.expectAssertions(1);
+}
 Components.utils.import("resource://gre/modules/Services.jsm");
 
 function waitOneEvent(element, name) {
   return new Promise(function(resolve, reject) {
     element.addEventListener(name, function() {
       resolve();
     }, {once: true});
   });