mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-12 22:28:59 +02:00
b995d946b5
Automatic update from web-platform-tests[css-grid] Apply content alignment during second pass When we integrated content alignment in the track sizing algorithm (r566412) we forgot to do it too when the 2nd pass is needed. The patch is very simple and just adds the calls to apply content alignment in LayoutGrid::RepeatTracksSizingIfNeeded() for each axis. The spec also mentions it in the new 3 and 4 steps: https://drafts.csswg.org/css-grid/#algo-overview So the new code just aligns with the spec. BUG=870634 TEST=external/wpt/css/css-grid/alignment/grid-content-alignment-second-pass-001.html Change-Id: Iccbcea5da1011eae37b4923bb78334cddc76d027 Reviewed-on: https://chromium-review.googlesource.com/1161925 Reviewed-by: Sergio Villar <svillar@igalia.com> Commit-Queue: Manuel Rego <rego@igalia.com> Cr-Commit-Position: refs/heads/master@{#580890} -- wpt-commits: 0bc8ef9382a661bcb48b70de19f3d0fedd0646f2 wpt-pr: 12292
65 lines
2.9 KiB
HTML
65 lines
2.9 KiB
HTML
<!DOCTYPE html>
|
|
<meta charset="utf-8">
|
|
<title>CSS Grid Layout Test: Content alignment second pass</title>
|
|
<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
|
|
<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-align">
|
|
<link rel="help" href="https://drafts.csswg.org/css-grid-1/#algo-overview">
|
|
<meta name="flags" content="ahem dom">
|
|
<meta name="assert" content="This test checks that content alignment is properly applied when the size of the tracks changes in the second pass of the track sizing algorithm.">
|
|
<link rel="stylesheet" href="../../support/grid.css">
|
|
<link rel="stylesheet" href="../../support/alignment.css">
|
|
|
|
<style>
|
|
.grid {
|
|
position: relative;
|
|
width: 100px;
|
|
height: 50px;
|
|
font: 25px/1 Ahem;
|
|
margin: 10px;
|
|
}
|
|
</style>
|
|
|
|
<script src="/resources/testharness.js"></script>
|
|
<script src="/resources/testharnessreport.js"></script>
|
|
<script src="/resources/check-layout-th.js"></script>
|
|
|
|
<body onLoad="checkLayout('.grid');">
|
|
|
|
<div id="log"></div>
|
|
|
|
<div class="grid">
|
|
<div class="firstRowFirstColumn verticalLR" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="50">XX X</div>
|
|
</div>
|
|
|
|
<div class="grid contentStretch">
|
|
<div class="firstRowFirstColumn verticalLR" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="50">XX X</div>
|
|
</div>
|
|
|
|
<div class="grid contentStart">
|
|
<div class="firstRowFirstColumn verticalLR" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50">XX X</div>
|
|
</div>
|
|
|
|
<div class="grid contentCenter">
|
|
<div class="firstRowFirstColumn verticalLR" data-offset-x="25" data-offset-y="0" data-expected-width="50" data-expected-height="50">XX X</div>
|
|
</div>
|
|
|
|
<div class="grid contentEnd">
|
|
<div class="firstRowFirstColumn verticalLR" data-offset-x="50" data-offset-y="0" data-expected-width="50" data-expected-height="50">XX X</div>
|
|
</div>
|
|
|
|
<div class="grid contentSpaceBetween">
|
|
<div class="firstRowFirstColumn verticalLR" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50">XX X</div>
|
|
<div class="firstRowSecondColumn" data-offset-x="75" data-offset-y="0" data-expected-width="25" data-expected-height="50">X</div>
|
|
</div>
|
|
|
|
<div class="grid contentSpaceEvenly" style="width: 105px;">
|
|
<div class="firstRowFirstColumn verticalLR" data-offset-x="10" data-offset-y="0" data-expected-width="50" data-expected-height="50">XX X</div>
|
|
<div class="firstRowSecondColumn" data-offset-x="70" data-offset-y="0" data-expected-width="25" data-expected-height="50">X</div>
|
|
</div>
|
|
|
|
<div class="grid contentSpaceAround" style="width: 115px;">
|
|
<div class="firstRowFirstColumn verticalLR" data-offset-x="10" data-offset-y="0" data-expected-width="50" data-expected-height="50">XX X</div>
|
|
<div class="firstRowSecondColumn" data-offset-x="80" data-offset-y="0" data-expected-width="25" data-expected-height="50">X</div>
|
|
</div>
|
|
|
|
</body>
|