Bug 1102374 - Enable display:contents by default in non-release builds. r=dbaron
authorMats Palmgren <mats@mozilla.com>
Mon, 01 Dec 2014 15:55:16 +0000
changeset 234913 265e01c7ff55061403da9877f84499b33df34587
parent 234912 05ef711f1e133fac24f5b56dd0d53f5c680c62f6
child 234925 4f6ed36fa9f5008f1aad6e17a734917a81b8570b
child 234929 e3ce0e3a147c749222e28c1d2fa9137f9d8e0cc0
push id7472
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 20:36:27 +0000
treeherdermozilla-aurora@300ca104f8fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs1102374
milestone37.0a1
Bug 1102374 - Enable display:contents by default in non-release builds. r=dbaron
layout/inspector/tests/test_bug877690.html
layout/style/test/test_position_float_display.html
modules/libpref/init/all.js
--- a/layout/inspector/tests/test_bug877690.html
+++ b/layout/inspector/tests/test_bug877690.html
@@ -161,17 +161,17 @@ function do_test() {
   var prop = "display";
   var values = utils.getCSSValuesForProperty(prop);
   var expected = [ "initial", "inherit", "unset", "none", "inline", "block", "inline-block", "list-item",
       "table", "inline-table", "table-row-group", "table-header-group", "table-footer-group", "table-row",
       "table-column-group", "table-column", "table-cell", "table-caption", "-moz-box", "-moz-inline-box",
       "-moz-grid", "-moz-inline-grid", "-moz-grid-group", "-moz-grid-line", "-moz-stack", "-moz-inline-stack",
       "-moz-deck", "-moz-popup", "-moz-groupbox", "flex", "inline-flex", "grid",
       "inline-grid", "ruby", "ruby-base", "ruby-base-container", "ruby-text",
-      "ruby-text-container" ];
+      "ruby-text-container", "contents" ];
   ok(testValues(values, expected), "property display's values.");
 
   // test property
   var prop = "float";
   var values = utils.getCSSValuesForProperty(prop);
   var expected = [ "initial", "inherit", "unset", "none", "left", "right" ];
   ok(testValues(values, expected), "proprety float values");
 
--- a/layout/style/test/test_position_float_display.html
+++ b/layout/style/test/test_position_float_display.html
@@ -51,16 +51,17 @@ var mapping = {
   "flex": "flex",
   "grid": "grid",
   "none": "none",
   "table": "table",
   "inline-grid": "grid",
   "inline-flex": "flex",
   "inline-table": "table",
   "block": "block",
+  "contents": "contents",
   // Note: this is sometimes block
   "list-item": "list-item"
 };
 
 function test_display_value(val)
 {
   var floatLeftElem = document.getElementById("float-left");
   floatLeftElem.style.display = val;
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2154,17 +2154,21 @@ pref("layout.css.grid.enabled", false);
 //
 // When this pref is removed, make sure that the pref callback registration
 // in nsLayoutStylesheetCache::EnsureGlobal and the invalidation of
 // mUASheet in nsLayoutStylesheetCache::DependentPrefChanged (if it's not
 // otherwise needed) are removed.
 pref("layout.css.ruby.enabled", false);
 
 // Is support for CSS display:contents enabled?
+#ifdef RELEASE_BUILD
 pref("layout.css.display-contents.enabled", false);
+#else
+pref("layout.css.display-contents.enabled", true);
+#endif
 
 // Is support for CSS box-decoration-break enabled?
 pref("layout.css.box-decoration-break.enabled", true);
 
 // Is layout of CSS outline-style:auto enabled?
 pref("layout.css.outline-style-auto.enabled", false);
 
 // Is CSSOM-View scroll-behavior and its MSD smooth scrolling enabled?