зеркало из https://github.com/mozilla/gecko-dev.git
Bug 984711 part 1: Revert tweaks to unit tests, now that 'min-width:auto' support is coming back. (no review; just an unbitrotted backout)
This reverts changeset afe27d80eeef from bug 848539.
This commit is contained in:
Daniel Holbert
Родитель
d6a31c96eb
Коммит
904907cda2
|
|
@ -16,7 +16,6 @@
|
|||
width: 50px;
|
||||
height: 50px;
|
||||
background: purple;
|
||||
min-width: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,8 @@
|
|||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<!--
|
||||
This test checks that a canvas element with "min-width: min-content"
|
||||
and a huge specified "width" ends up being shrinkable. (In particular,
|
||||
the large "width" value shouldn't influence the min-content width).
|
||||
This test checks that canvas elements' default "min-width: auto" property
|
||||
is handled correctly (i.e. isn't influenced by the "width" property).
|
||||
-->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
|
|
@ -21,7 +20,6 @@
|
|||
width: 1000px;
|
||||
height: 50px;
|
||||
background: purple;
|
||||
min-width: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -17,9 +17,6 @@
|
|||
width: 50px;
|
||||
height: 50px;
|
||||
background: purple;
|
||||
/* min-height: min-content isn't supported yet (bug 852367), but we'd
|
||||
like this to work when it is supported. */
|
||||
min-height: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,8 @@
|
|||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<!--
|
||||
This test checks that a canvas element with "min-height: min-content"
|
||||
and a huge specified "height" ends up being shrinkable. (In particular,
|
||||
the large "height" value shouldn't influence the min-content height).
|
||||
This test checks that canvas elements' default "min-height: auto" property
|
||||
is handled correctly (i.e. isn't influenced by the "height" property).
|
||||
-->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
|
|
@ -22,9 +21,6 @@
|
|||
width: 50px;
|
||||
height: 1000px;
|
||||
background: purple;
|
||||
/* min-height: min-content isn't supported yet (bug 852367), but we'd
|
||||
like this to work when it is supported. */
|
||||
min-height: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
height: 50px;
|
||||
background: purple;
|
||||
border: 1px dotted green;
|
||||
min-width: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,8 @@
|
|||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<!--
|
||||
This test checks that a fieldset element with "min-width: min-content"
|
||||
and a huge specified "width" ends up being shrinkable. (In particular,
|
||||
the large "width" value shouldn't influence the min-content width).
|
||||
This test checks that fieldset elements' default "min-width: auto" property
|
||||
is handled correctly (i.e. isn't influenced by the "width" property).
|
||||
-->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
|
|
@ -22,7 +21,6 @@
|
|||
height: 50px;
|
||||
background: purple;
|
||||
border: 1px dotted green;
|
||||
min-width: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -18,9 +18,6 @@
|
|||
height: 50px;
|
||||
background: purple;
|
||||
border: 1px dotted green;
|
||||
/* min-height: min-content isn't supported yet (bug 852367), but we'd
|
||||
like this to work when it is supported. */
|
||||
min-height: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<!--
|
||||
This test checks that a fieldset element with "min-height: min-content"
|
||||
and a huge specified "height" ends up being shrinkable. (In particular,
|
||||
the large "height" value shouldn't influence the min-content height).
|
||||
This test checks that fieldset elements' default "min-height: auto"
|
||||
property is handled correctly (i.e. isn't influenced by the "height"
|
||||
property).
|
||||
-->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
|
|
@ -23,9 +23,6 @@
|
|||
height: 1000px;
|
||||
background: purple;
|
||||
border: 1px dotted green;
|
||||
/* min-height: min-content isn't supported yet (bug 852367), but we'd
|
||||
like this to work when it is supported. */
|
||||
min-height: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
width: 50px;
|
||||
height: 50px;
|
||||
background: purple;
|
||||
min-width: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,8 @@
|
|||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<!--
|
||||
This test checks that an iframe element with "min-width: min-content"
|
||||
and a huge specified "width" ends up being shrinkable. (In particular,
|
||||
the large "width" value shouldn't influence the min-content width).
|
||||
This test checks that iframe elements' default "min-width: auto" property
|
||||
is handled correctly (i.e. isn't influenced by the "width" property).
|
||||
-->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
|
|
@ -21,7 +20,6 @@
|
|||
width: 1000px;
|
||||
height: 50px;
|
||||
background: purple;
|
||||
min-width: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -17,9 +17,6 @@
|
|||
width: 50px;
|
||||
height: 50px;
|
||||
background: purple;
|
||||
/* min-height: min-content isn't supported yet (bug 852367), but we'd
|
||||
like this to work when it is supported. */
|
||||
min-height: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,8 @@
|
|||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<!--
|
||||
This test checks that an iframe element with "min-height: min-content"
|
||||
and a huge specified "height" ends up being shrinkable. (In particular,
|
||||
the large "height" value shouldn't influence the min-content height).
|
||||
This test checks that iframe elements' default "min-height: auto" property
|
||||
is handled correctly (i.e. isn't influenced by the "height" property).
|
||||
-->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
|
|
@ -22,9 +21,6 @@
|
|||
width: 50px;
|
||||
height: 1000px;
|
||||
background: purple;
|
||||
/* min-height: min-content isn't supported yet (bug 852367), but we'd
|
||||
like this to work when it is supported. */
|
||||
min-height: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
width: 50px;
|
||||
height: 50px;
|
||||
background: purple;
|
||||
min-width: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,8 @@
|
|||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<!--
|
||||
This test checks that an img element with "min-width: min-content"
|
||||
and a huge specified "width" ends up being shrinkable. (In particular,
|
||||
the large "width" value shouldn't influence the min-content width).
|
||||
This test checks that img elements' default "min-width: auto" property
|
||||
is handled correctly (i.e. isn't influenced by the "width" property).
|
||||
-->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
|
|
@ -21,7 +20,6 @@
|
|||
width: 1000px;
|
||||
height: 50px;
|
||||
background: purple;
|
||||
min-width: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -17,9 +17,6 @@
|
|||
width: 50px;
|
||||
height: 50px;
|
||||
background: purple;
|
||||
/* min-height: min-content isn't supported yet (bug 852367), but we'd
|
||||
like this to work when it is supported. */
|
||||
min-height: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,8 @@
|
|||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<!--
|
||||
This test checks that an img element with "min-height: min-content"
|
||||
and a huge specified "height" ends up being shrinkable. (In particular,
|
||||
the large "height" value shouldn't influence the min-content height).
|
||||
This test checks that img elements' default "min-height: auto" property
|
||||
is handled correctly (i.e. isn't influenced by the "height" property).
|
||||
-->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
|
|
@ -22,9 +21,6 @@
|
|||
width: 50px;
|
||||
height: 1000px;
|
||||
background: purple;
|
||||
/* min-height: min-content isn't supported yet (bug 852367), but we'd
|
||||
like this to work when it is supported. */
|
||||
min-height: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
height: 50px;
|
||||
background: purple;
|
||||
border: 1px dotted green;
|
||||
min-width: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,8 @@
|
|||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<!--
|
||||
This test checks that a textarea element with "min-width: min-content"
|
||||
and a huge specified "width" ends up being shrinkable. (In particular,
|
||||
the large "width" value shouldn't influence the min-content width).
|
||||
This test checks that textarea elements' default "min-width: auto" property
|
||||
is handled correctly (i.e. isn't influenced by the "width" property).
|
||||
-->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
|
|
@ -22,7 +21,6 @@
|
|||
height: 50px;
|
||||
background: purple;
|
||||
border: 1px dotted green;
|
||||
min-width: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -18,9 +18,6 @@
|
|||
height: 50px;
|
||||
background: purple;
|
||||
border: 1px dotted green;
|
||||
/* min-height: min-content isn't supported yet (bug 852367), but we'd
|
||||
like this to work when it is supported. */
|
||||
min-height: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<!--
|
||||
This test checks that a textarea element with "min-height: min-content"
|
||||
and a huge specified "height" ends up being shrinkable. (In particular,
|
||||
the large "height" value shouldn't influence the min-content height).
|
||||
This test checks that textarea elements' default "min-height: auto"
|
||||
property is handled correctly (i.e. isn't influenced by the "height"
|
||||
property).
|
||||
-->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
|
|
@ -23,9 +23,6 @@
|
|||
height: 1000px;
|
||||
background: purple;
|
||||
border: 1px dotted green;
|
||||
/* min-height: min-content isn't supported yet (bug 852367), but we'd
|
||||
like this to work when it is supported. */
|
||||
min-height: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
width: 50px;
|
||||
height: 50px;
|
||||
background: purple;
|
||||
min-width: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,8 @@
|
|||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<!--
|
||||
This test checks that a video element with "min-width: min-content"
|
||||
and a huge specified "width" ends up being shrinkable. (In particular,
|
||||
the large "width" value shouldn't influence the min-content width).
|
||||
This test checks that video elements' default "min-width: auto" property
|
||||
is handled correctly (i.e. isn't influenced by the "width" property).
|
||||
-->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
|
|
@ -21,7 +20,6 @@
|
|||
width: 1000px;
|
||||
height: 50px;
|
||||
background: purple;
|
||||
min-width: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -17,9 +17,6 @@
|
|||
width: 50px;
|
||||
height: 50px;
|
||||
background: purple;
|
||||
/* min-height: min-content isn't supported yet (bug 852367), but we'd
|
||||
like this to work when it is supported. */
|
||||
min-height: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,8 @@
|
|||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<!--
|
||||
This test checks that a video element with "min-height: min-content"
|
||||
and a huge specified "height" ends up being shrinkable. (In particular,
|
||||
the large "height" value shouldn't influence the min-content height).
|
||||
This test checks that video elements' default "min-height: auto" property
|
||||
is handled correctly (i.e. isn't influenced by the "height" property).
|
||||
-->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
|
|
@ -22,9 +21,6 @@
|
|||
width: 50px;
|
||||
height: 1000px;
|
||||
background: purple;
|
||||
/* min-height: min-content isn't supported yet (bug 852367), but we'd
|
||||
like this to work when it is supported. */
|
||||
min-height: -moz-min-content;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<!--
|
||||
This test checks that we correctly handle flex items with an explicit
|
||||
"min-width: -moz-min-content".
|
||||
This test checks that we honor the flexbox-specific behavior of the
|
||||
new "min-width: auto" value that was introduced in the flexbox spec.
|
||||
|
||||
We check that such flex items can't shrink below their min-content width,
|
||||
We check that flex items can't shrink below their min-content width,
|
||||
unless we explicitly reduce their min-width with e.g. "min-width: 0".
|
||||
-->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
|
|
@ -25,7 +25,6 @@
|
|||
border: 1px dashed green;
|
||||
background: lightblue;
|
||||
height: 40px;
|
||||
min-width: -moz-min-content;
|
||||
}
|
||||
div.smallSize { width: 5px; }
|
||||
div.smallFlexBasis { flex-basis: 2px; }
|
||||
|
|
@ -35,8 +34,8 @@
|
|||
</head>
|
||||
<body>
|
||||
|
||||
<!-- Check that we honor "min-width: min-content" as a lower-bound when
|
||||
sizing flex items. -->
|
||||
<!-- Check that we use the min-content width as a lower-bound when sizing
|
||||
flex items. -->
|
||||
<div class="flexbox">
|
||||
<div>abc d e f</div>
|
||||
<div class="smallSize">abc d e f</div>
|
||||
|
|
@ -50,8 +49,9 @@
|
|||
<div class="smallFlexBasis">abc d e f</div>
|
||||
</div>
|
||||
|
||||
<!-- Test that we don't clamp when we've got "min-width: 0" on our
|
||||
flex items, though. -->
|
||||
<!-- Test that "min-width: 0" on flex items will keep us from clamping to
|
||||
the min-content width. (So we can now actually honor small 'width'
|
||||
and 'flex-basis' values.) -->
|
||||
<div class="flexbox">
|
||||
<div class="zeroMinWidth">abc d e f</div>
|
||||
<div class="zeroMinWidth smallSize">abc d e f</div>
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<!--
|
||||
This test checks that we correctly handle flex items with an explicit
|
||||
"min-height: -moz-min-content".
|
||||
This test checks that we honor the flexbox-specific behavior of the
|
||||
new "min-height: auto" value that was introduced in the flexbox spec.
|
||||
|
||||
We check that such flex items can't shrink below their min-content height,
|
||||
We check that flex items can't shrink below their min-content height,
|
||||
unless we explicitly reduce their min-height with e.g. "min-height: 0".
|
||||
-->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
|
|
@ -27,7 +27,6 @@
|
|||
border: 1px dashed green;
|
||||
background: lightblue;
|
||||
width: 40px;
|
||||
min-height: -moz-min-content; /* not yet supported -- see bug 852367 */
|
||||
}
|
||||
div.smallSize { height: 5px; }
|
||||
div.smallFlexBasis { flex-basis: 2px; }
|
||||
|
|
@ -37,8 +36,8 @@
|
|||
</head>
|
||||
<body>
|
||||
|
||||
<!-- Check that we honor "min-height: min-content" as a lower-bound when
|
||||
sizing flex items. -->
|
||||
<!-- Check that we use the min-content height as a lower-bound when sizing
|
||||
flex items. -->
|
||||
<div class="flexbox">
|
||||
<div>a b</div>
|
||||
<div class="smallSize">a b</div>
|
||||
|
|
@ -52,8 +51,9 @@
|
|||
<div class="smallFlexBasis">a b</div>
|
||||
</div>
|
||||
|
||||
<!-- Test that we don't clamp when we've got "min-height: 0" on our
|
||||
flex items, though. -->
|
||||
<!-- Test that "min-height: 0" on flex items will keep us from clamping to
|
||||
the min-content height. (So we can now actually honor small 'height'
|
||||
and 'flex-basis' values.) -->
|
||||
<div class="flexbox">
|
||||
<div class="zeroMinHeight">a b</div>
|
||||
<div class="zeroMinHeight smallSize">a b</div>
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
}
|
||||
div.flexbox > * {
|
||||
max-width: 3px;
|
||||
min-width: 0; /* to override default 'min-width:auto' */
|
||||
outline: 1px dashed black;
|
||||
margin: 0;
|
||||
vertical-align: top;
|
||||
|
|
|
|||
|
|
@ -26,26 +26,17 @@ fuzzy-if(B2G,10,3) random-if(winWidget) == flexbox-align-self-baseline-horiz-3.x
|
|||
# want to upload tests with prefixed keywords to the W3C testsuite.
|
||||
|
||||
== flexbox-basic-canvas-horiz-2.xhtml flexbox-basic-canvas-horiz-2-ref.xhtml
|
||||
# NOTE: This test will only test something useful once we add support for
|
||||
# "min-height: -moz-min-content", bug 852367. At that point, it will probably
|
||||
# fail until bug 794660 is fixed:
|
||||
== flexbox-basic-canvas-vert-2.xhtml flexbox-basic-canvas-vert-2-ref.xhtml
|
||||
fails == flexbox-basic-canvas-vert-2.xhtml flexbox-basic-canvas-vert-2-ref.xhtml # bug 794660
|
||||
== flexbox-basic-fieldset-horiz-2.xhtml flexbox-basic-fieldset-horiz-2-ref.xhtml
|
||||
== flexbox-basic-fieldset-vert-2.xhtml flexbox-basic-fieldset-vert-2-ref.xhtml
|
||||
== flexbox-basic-iframe-horiz-2.xhtml flexbox-basic-iframe-horiz-2-ref.xhtml
|
||||
== flexbox-basic-iframe-vert-2.xhtml flexbox-basic-iframe-vert-2-ref.xhtml
|
||||
== flexbox-basic-img-horiz-2.xhtml flexbox-basic-img-horiz-2-ref.xhtml
|
||||
# NOTE: This test will only test something useful once we add support for
|
||||
# "min-height: -moz-min-content", bug 852367. At that point, it will probably
|
||||
# fail until bug 794660 is fixed:
|
||||
== flexbox-basic-img-vert-2.xhtml flexbox-basic-img-vert-2-ref.xhtml
|
||||
fails == flexbox-basic-img-vert-2.xhtml flexbox-basic-img-vert-2-ref.xhtml # bug 794660
|
||||
== flexbox-basic-textarea-horiz-2.xhtml flexbox-basic-textarea-horiz-2-ref.xhtml
|
||||
== flexbox-basic-textarea-vert-2.xhtml flexbox-basic-textarea-vert-2-ref.xhtml
|
||||
== flexbox-basic-video-horiz-2.xhtml flexbox-basic-video-horiz-2-ref.xhtml
|
||||
# NOTE: This test will only test something useful once we add support for
|
||||
# "min-height: -moz-min-content", bug 852367. At that point, it will probably
|
||||
# fail until bug 794660 is fixed:
|
||||
== flexbox-basic-video-vert-2.xhtml flexbox-basic-video-vert-2-ref.xhtml
|
||||
fails == flexbox-basic-video-vert-2.xhtml flexbox-basic-video-vert-2-ref.xhtml # bug 794660
|
||||
|
||||
# Tests for box-sizing on flex containers and flex items.
|
||||
== flexbox-box-sizing-on-container-horiz-1.html flexbox-box-sizing-on-container-horiz-1-ref.html
|
||||
|
|
@ -93,9 +84,9 @@ fuzzy-if(B2G,10,3) random-if(winWidget) == flexbox-align-self-baseline-horiz-3.x
|
|||
== flexbox-float-2a.xhtml flexbox-float-2-ref.xhtml
|
||||
== flexbox-float-2b.xhtml flexbox-float-2-ref.xhtml
|
||||
|
||||
# Tests for "min-width" and "min-height" on flex items.
|
||||
# Tests for (default) "min-width: auto" / "min-height: auto" in flex containers
|
||||
== flexbox-minSize-horiz-1.xhtml flexbox-minSize-horiz-1-ref.xhtml
|
||||
fails == flexbox-minSize-vert-1.xhtml flexbox-minSize-vert-1-ref.xhtml # bug 852367
|
||||
== flexbox-minSize-vert-1.xhtml flexbox-minSize-vert-1-ref.xhtml
|
||||
|
||||
# Tests for the order in which we paint flex items
|
||||
fails == flexbox-paint-ordering-3.html flexbox-paint-ordering-3-ref.html # bug 874718
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче