Bug 1140198 - Tweak display:contents test to make this test green again. r=me on a CLOSED TREE
authorMats Palmgren <mats@mozilla.com>
Sat, 07 Mar 2015 17:38:57 +0000
changeset 232400 99a276974d6d0a357074f2dba31b3dd6b47a5d10
parent 232399 cb1c692e89638fada258ff3539ad16d2e1ecc26b
child 232401 fac66b2cc608319bf5b3f015bf07cd477767df8a
push id56541
push usermpalmgren@mozilla.com
push dateSat, 07 Mar 2015 17:41:17 +0000
treeherdermozilla-inbound@99a276974d6d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1140198
milestone39.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 1140198 - Tweak display:contents test to make this test green again. r=me on a CLOSED TREE
layout/style/test/test_root_node_display.html
--- a/layout/style/test/test_root_node_display.html
+++ b/layout/style/test/test_root_node_display.html
@@ -40,16 +40,21 @@ function test_display_value(val)
   // (and we do convert it, so that we don't have to support documents whose
   // root node is a list-item).
   if (val == "list-item") {
     is(floatConversion, val, "'float' shouldn't affect 'display:list-item'");
     is(rootConversion, "block",
        "We traditionally convert 'display:list-item' on the root node to " +
        "'display:block' (though if that changes, it's not technically a bug, " +
        "as long as we support it properly).");
+  } else if (val == "contents") {
+    is(floatConversion, val, "'float' shouldn't affect 'display:contents'");
+    is(rootConversion, "block",
+       "'display:contents' on the root node computes to block-level per" +
+       "http://dev.w3.org/csswg/css-display/#transformations");
   } else {
     is(rootConversion, floatConversion,
        "root node should make 'display:" + val + "' compute to the same " +
        "value that it computes to on a floated element");
   }
 }
 
 var displayInfo = gCSSProperties["display"];