Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html

Issue 592803003: [CSS Grid Layout] Size tracks using a list of all items sorted by span (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressed reviewer's comments Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution-expected.txt » ('j') | Source/core/rendering/RenderGrid.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
diff --git a/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html b/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
index 8c6cef1d2393c6d8ff7d5ba1d8172ff774077c54..bd440b60e8a44fee8eee4d885fd26261650b3892 100644
--- a/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
@@ -98,6 +98,152 @@
<div class="firstRowBothColumn">XXXX XXXX</div>
</div>
+<!-- Check that items are processed by ascending span instead of going track by track forbidding extra space distribution. -->
+<div class="constrainedContainer">
+ <div class="grid gridMinContentFixedAndAuto" id="gridMinContentFixedAndAutoUnsortedConstrained">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoAndAuto" id="gridAutoAndAutoUnsortedConstrained">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridMinContentAndMinContentFixed" id="gridMinContentAndMinContentFixedUnsortedConstrained">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridMaxContentAndMinContent" id="gridMaxContentAndMinContentUnsortedConstrained">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridFixedMinContentAndMaxContent" id="gridFixedMinContentAndMaxContentUnsortedConstrained">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridFixedMaxContentAndMinContent" id="gridFixedMaxContentAndMinContentUnsortedConstrained">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridMinContentAndMaxContentFixed" id="gridMinContentAndMaxContentFixedUnsortedConstrained">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridMaxContentFixedAndAuto" id="gridMaxContentFixedAndAutoUnsortedConstrained">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoMinContent" id="gridAutoMinContentUnsortedConstrained">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoMaxContent" id="gridAutoMaxContentUnsortedConstrained">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridMaxContentAndMinContentFixed" id="gridMaxContentAndMinContentFixedUnsortedConstrained">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridMaxContentAndMaxContentFixed" id="gridMaxContentAndMaxContentFixedUnsortedConstrained">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+ </div>
+</div>
+
+<!-- Check that items are processed by ascending span instead of going track by track allowing extra space distribution. -->
+<div class="grid gridMinContentFixedAndAuto" id="gridMinContentFixedAndAutoUnsorted">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+</div>
+
+<div class="grid gridAutoAndAuto" id="gridAutoAndAutoUnsorted">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+</div>
+
+<div class="grid gridMinContentAndMinContentFixed" id="gridMinContentAndMinContentFixedUnsorted">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+</div>
+
+<div class="grid gridMaxContentAndMinContent" id="gridMaxContentAndMinContentUnsorted">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+</div>
+
+<div class="grid gridFixedMinContentAndMaxContent" id="gridFixedMinContentAndMaxContentUnsorted">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+</div>
+
+<div class="grid gridFixedMaxContentAndMinContent" id="gridFixedMaxContentAndMinContentUnsorted">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+</div>
+
+<div class="grid gridMinContentAndMaxContentFixed" id="gridMinContentAndMaxContentFixedUnsorted">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+</div>
+
+<div class="grid gridMaxContentFixedAndAuto" id="gridMaxContentFixedAndAutoUnsorted">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+</div>
+
+<div class="grid gridAutoMinContent" id="gridAutoMinContentUnsorted">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+</div>
+
+<div class="grid gridAutoMaxContent" id="gridAutoMaxContentUnsorted">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+</div>
+
+<div class="grid gridMaxContentAndMinContentFixed" id="gridMaxContentAndMinContentFixedUnsorted">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+</div>
+
+<div class="grid gridMaxContentAndMaxContentFixed" id="gridMaxContentAndMaxContentFixedUnsorted">
+ <div class="firstRowBothColumn">XXXX XXXX</div>
+ <div class="firstRowSecondColumn">XXXX XXXX</div>
+</div>
Julien - ping for review 2014/10/13 19:38:18 All the tests are using the same items. It would b
svillar 2014/10/14 06:32:01 Yeah, it was easier for me to compute the expected
+
<script>
function testGridColumnsValues(id, computedColumnValue)
{
@@ -116,6 +262,36 @@
testGridColumnsValues("gridAutoMaxContent", "20px 70px");
testGridColumnsValues("gridMaxContentAndMinContentFixed", "70px 20px");
testGridColumnsValues("gridMaxContentAndMaxContentFixed", "55px 35px");
+
+ debug("");
+ debug("Check that items are processed by ascending span to compute track breadths forbidding extra space distribution.");
+ testGridColumnsValues("gridMinContentFixedAndAutoUnsortedConstrained", "0px 40px");
+ testGridColumnsValues("gridAutoAndAutoUnsortedConstrained", "0px 40px");
+ testGridColumnsValues("gridMinContentAndMinContentFixedUnsortedConstrained", "0px 40px");
+ testGridColumnsValues("gridMaxContentAndMinContentUnsortedConstrained", "50px 40px");
+ testGridColumnsValues("gridFixedMinContentAndMaxContentUnsortedConstrained", "10px 90px");
+ testGridColumnsValues("gridFixedMaxContentAndMinContentUnsortedConstrained", "10px 40px");
+ testGridColumnsValues("gridMinContentAndMaxContentFixedUnsortedConstrained", "0px 90px");
+ testGridColumnsValues("gridMaxContentFixedAndAutoUnsortedConstrained", "50px 40px");
+ testGridColumnsValues("gridAutoMinContentUnsortedConstrained", "0px 40px");
+ testGridColumnsValues("gridAutoMaxContentUnsortedConstrained", "0px 90px");
+ testGridColumnsValues("gridMaxContentAndMinContentFixedUnsortedConstrained", "50px 40px");
+ testGridColumnsValues("gridMaxContentAndMaxContentFixedUnsortedConstrained", "0px 90px");
+
+ debug("");
+ debug("Check that items are processed by ascending span to compute track breadths allowing extra space distribution.");
+ testGridColumnsValues("gridMinContentFixedAndAutoUnsorted", "15px 90px");
+ testGridColumnsValues("gridAutoAndAutoUnsorted", "0px 90px");
+ testGridColumnsValues("gridMinContentAndMinContentFixedUnsorted", "10px 40px");
+ testGridColumnsValues("gridMaxContentAndMinContentUnsorted", "50px 40px");
+ testGridColumnsValues("gridFixedMinContentAndMaxContentUnsorted", "10px 90px");
+ testGridColumnsValues("gridFixedMaxContentAndMinContentUnsorted", "50px 40px");
+ testGridColumnsValues("gridMinContentAndMaxContentFixedUnsorted", "10px 90px");
+ testGridColumnsValues("gridMaxContentFixedAndAutoUnsorted", "50px 90px");
+ testGridColumnsValues("gridAutoMinContentUnsorted", "50px 40px");
+ testGridColumnsValues("gridAutoMaxContentUnsorted", "0px 90px");
+ testGridColumnsValues("gridMaxContentAndMinContentFixedUnsorted", "55px 40px");
+ testGridColumnsValues("gridMaxContentAndMaxContentFixedUnsorted", "55px 90px");
</script>
</body>
</html>
« no previous file with comments | « no previous file | LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution-expected.txt » ('j') | Source/core/rendering/RenderGrid.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698