Backed out 2 changesets (bug 1299133) for win vm reftest failures a=backout CLOSED TREE

Backed out changeset fa010785b1ed (bug 1299133)
Backed out changeset 8898636baa30 (bug 1299133)
This commit is contained in:
Wes Kocher 2016-09-12 15:53:52 -07:00
parent 677438b338
commit e03e64c99f
4 changed files with 8 additions and 308 deletions

View File

@ -1195,18 +1195,18 @@ struct nsGridContainerFrame::Tracks
* Collect the tracks which are growable (matching aSelector) into
* aGrowableTracks, and return the amount of space that can be used
* to grow those tracks. Specifically, we return aAvailableSpace minus
* the sum of mBase's (and corresponding grid gaps) in aPlan (clamped to 0)
* for the tracks in aRange, or zero when there are no growable tracks.
* the sum of mBase's in aPlan (clamped to 0) for the tracks in aRange,
* or zero when there are no growable tracks.
* @note aPlan[*].mBase represents a planned new base or limit.
*/
nscoord CollectGrowable(nscoord aAvailableSpace,
const nsTArray<TrackSize>& aPlan,
const LineRange& aRange,
TrackSize::StateBits aSelector,
nsTArray<uint32_t>& aGrowableTracks) const
static nscoord CollectGrowable(nscoord aAvailableSpace,
const nsTArray<TrackSize>& aPlan,
const LineRange& aRange,
TrackSize::StateBits aSelector,
nsTArray<uint32_t>& aGrowableTracks)
{
MOZ_ASSERT(aAvailableSpace > 0, "why call me?");
nscoord space = aAvailableSpace - mGridGap * (aRange.Extent() - 1);
nscoord space = aAvailableSpace;
const uint32_t start = aRange.mStart;
const uint32_t end = aRange.mEnd;
for (uint32_t i = start; i < end; ++i) {

View File

@ -1,148 +0,0 @@
<!DOCTYPE HTML>
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<html><head>
<meta charset="utf-8">
<title>CSS Grid Test: fit-content() track sizing</title>
<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1299133">
<style type="text/css">
body,html { color:black; background:white; font-size:16px; padding:0; margin:0; }
.grid {
display: grid;
grid-auto-rows: 5px;
justify-content: start;
position: relative;
border: 1px solid;
}
.c1 { grid-template-columns: fit-content(40%) 25px minmax(100px, 1fr); }
.c2 { grid-template-columns: fit-content(40%) 25px 0 25px minmax(100px, 1fr); }
.c3 { grid-template-columns: fit-content(40%) 25px fit-content(40%) 25px minmax(0px, 1fr); }
.c4 { grid-template-columns: fit-content(40%) 25px 100px 25px minmax(100px, 1fr); }
.c5 { grid-template-columns: fit-content(40%) 25px minmax(0, 1fr) 25px minmax(100px, 1fr); }
.c6 { grid-template-columns: fit-content(calc(1px - 99%)) 25px minmax(0, 1fr) 25px minmax(100px, 1fr); }
.c7 { grid-template-columns: fit-content(40%) 25px fit-content(40%); }
span {
grid-column: 1 / span 3;
grid-row: 2;
height: 2px;
background: lime;
min-width: 50px;
}
.c1 span { grid-column:1; }
a {
display: inline-block;
width: 50px;
height: 1px;
}
y {
position: absolute;
left: 0; right: 0; top: 0;
height: 2px;
background: purple;
grid-column: 1 / 2;
}
y:nth-of-type(2n) { background: orange; grid-column: 3 / 4; }
</style>
</head>
<body>
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c6"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div style="width:502px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c6"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:442px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:382px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:322px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:262px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:202px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c7"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:142px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:82px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:22px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c6"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:2px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
</body>
</html>

View File

@ -1,151 +0,0 @@
<!DOCTYPE HTML>
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<html><head>
<meta charset="utf-8">
<title>CSS Grid Test: fit-content() track sizing</title>
<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1299133">
<link rel="help" href="https://drafts.csswg.org/css-grid/#valdef-grid-template-columns-fit-content">
<link rel="match" href="grid-track-fit-content-sizing-002-ref.html">
<style type="text/css">
body,html { color:black; background:white; font-size:16px; padding:0; margin:0; }
.grid {
display: grid;
grid-auto-rows: 5px;
grid-column-gap: 25px;
justify-content: start;
position: relative;
border: 1px solid;
}
.c1 { grid-template-columns: fit-content(40%) minmax(100px, 1fr); }
.c2 { grid-template-columns: fit-content(40%) 0 minmax(100px, 1fr); }
.c3 { grid-template-columns: fit-content(40%) fit-content(40%) minmax(0px, 1fr); }
.c4 { grid-template-columns: fit-content(40%) 100px minmax(100px, 1fr); }
.c5 { grid-template-columns: fit-content(40%) minmax(0, 1fr) minmax(100px, 1fr); }
.c6 { grid-template-columns: fit-content(calc(1px - 99%)) minmax(0, 1fr) minmax(100px, 1fr); }
.c7 { grid-template-columns: none; grid-auto-columns: fit-content(40%); }
span {
grid-column: 1 / span 2;
grid-row: 2;
height: 2px;
background: lime;
min-width: 50px;
}
.c1 span { grid-column:1; }
a {
display: inline-block;
width: 50px;
height: 1px;
}
y {
position: absolute;
left: 0; right: 0; top: 0;
height: 2px;
background: purple;
grid-column: 1 / 2;
}
y:nth-of-type(2n) { background: orange; grid-column: 2 / 3; }
</style>
</head>
<body>
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c6"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div style="width:502px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c6"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:442px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:382px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:322px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:262px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:202px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c7"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:142px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:82px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:22px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c6"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
<div style="width:2px">
<div class="grid c1"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c2"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c3"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c4"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
<div class="grid c5"><span><a></a><a></a><a></a><a></a></span><y></y><y></y></div>
</div>
</body>
</html>

View File

@ -63,7 +63,6 @@ fuzzy-if(winWidget,1,36) == grid-auto-min-sizing-definite-001.html grid-auto-min
== grid-track-intrinsic-sizing-004.html grid-track-intrinsic-sizing-004-ref.html
== grid-track-percent-sizing-001.html grid-track-percent-sizing-001-ref.html
== grid-track-fit-content-sizing-001.html grid-track-fit-content-sizing-001-ref.html
== grid-track-fit-content-sizing-002.html grid-track-fit-content-sizing-002-ref.html
== grid-max-sizing-flex-001.html grid-max-sizing-flex-001-ref.html
== grid-max-sizing-flex-002.html grid-max-sizing-flex-002-ref.html
== grid-max-sizing-flex-003.html grid-max-sizing-flex-003-ref.html