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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 448993002: [CSSGridLayout] Skip items spanning flex tracks in track sizing algo (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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/flex-and-content-sized-resolution-columns-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/flex-and-content-sized-resolution-columns.html
diff --git a/LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns.html b/LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns.html
new file mode 100644
index 0000000000000000000000000000000000000000..0f1047850ffaa69ff71fec75556300f9a7742a30
--- /dev/null
+++ b/LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link href="resources/grid.css" rel="stylesheet">
+<style>
+.grid {
+ font: 10px/1 Ahem;
+}
+
+.gridFixedAndMinContentAndFlex {
+ grid-template-columns: 20px min-content 1fr;
+}
+
+.gridMinMaxFixedFlexAndMaxContentAndAuto {
+ grid-template-columns: minmax(20px, 1fr) max-content auto;
+}
+
+.gridMinMaxFlexFixedAndMinContentAndFixed {
+ grid-template-columns: minmax(0.5fr, 35px) min-content 25px;
+}
+
+.gridMinContentAndMinMaxFixedMinContentAndFlex {
+ grid-template-columns: min-content minmax(20px, min-content) 2fr;
+}
+
+.gridMaxContentAndMinMaxFixedMaxContentAndFlex {
+ grid-template-columns: max-content minmax(20px, max-content) 1fr;
+}
+
+</style>
+<script src="../../resources/js-test.js"></script>
+</head>
+<body>
+
+<p>Test that resolving auto tracks on grid items works properly.</p>
+
+<div style="position: relative; width: 100px;">
+ <div id="gridFixedAndMinContentAndFlex" class="grid gridFixedAndMinContentAndFlex">
+ <div style="grid-column: 2 / span 2;">XXXXXXXX</div>
+ <div style="grid-column: 1 / span 2; grid-row: 2;">XXXXX</div>
+ </div>
+</div>
+
+<div style="position: relative; width: 100px;">
+ <div id="gridFixedAndMinContentAndFlexMultipleOverlap" class="grid gridFixedAndMinContentAndFlex">
+ <div style="grid-column: 1 / span 2;">XXX XXX</div>
+ <div style="grid-column: 1 / -1; grid-row: 2;">XXXX</div>
+ </div>
+</div>
+
+<div style="position: relative; width: 100px;">
+ <div id="gridMinMaxFixedFlexAndMaxContentAndAuto" class="grid gridMinMaxFixedFlexAndMaxContentAndAuto">
+ <div style="grid-column: 1 / span 2;">XXX XXX</div>
+ <div style="grid-column: 2 / span 2; grid-row: 2;">XXXX</div>
+ </div>
+</div>
+
+<div style="position: relative; width: 100px;">
+ <div id="gridMinMaxFixedFlexAndMaxContentAndAutoNoFlexSpanningItems" class="grid gridMinMaxFixedFlexAndMaxContentAndAuto">
+ <div style="grid-column: 1 / -1;">XXX XXX</div>
+ <div style="grid-column: 1 / span 2; grid-row: 2;">XXXX XXXX</div>
+ </div>
+</div>
+
+<div style="position: relative; width: 100px;">
+ <div id="gridMinMaxFlexFixedAndMinContentAndFixed" class="grid gridMinMaxFlexFixedAndMinContentAndFixed">
+ <div style="grid-column: 1 / span 2;">XXXX XXXX</div>
+ <div style="grid-column: 2 / span 2; grid-row: 2;">XXX XXX</div>
+ <div style="grid-column: 1 / -1; grid-row: 3;">XXXXX XXXXX</div>
+ <div style="grid-column: 2 / span 2; grid-row: 4;">XX XX XX XX</div>
+ </div>
+</div>
+
+<div style="position: relative; width: 100px;">
+ <div id="gridMinContentAndMinMaxFixedMinContentAndFlex" class="grid gridMinContentAndMinMaxFixedMinContentAndFlex">
+ <div style="grid-column: 2 / span 2;">XXXXX</div>
+ <div style="grid-column: 1 / -1; grid-row: 2;">XXX XXX XXX</div>
+ <div style="grid-column: 1 / span 2; grid-row: 3;">XXXX XXXX</div>
+ </div>
+</div>
+
+<div style="position: relative; width: 100px;">
+ <div id="gridMaxContentAndMinMaxFixedMaxContentAndFlex" class="grid gridMaxContentAndMinMaxFixedMaxContentAndFlex">
+ <div style="grid-column: 2 / span 2;">XXXXX</div>
+ <div style="grid-column: 1 / -1; grid-row: 2;">XXX XXX XXX</div>
+ <div style="grid-column: 1 / span 2; grid-row: 3;">XXXX XXXX</div>
+ </div>
+</div>
+
+</body>
+<script src="resources/grid-definitions-parsing-utils.js"></script>
+<script>
+function checkColumns(gridId, columnValue)
+{
+ window.gridElement = document.getElementById(gridId);
+ shouldBeEqualToString("window.getComputedStyle(" + gridId + ", '').getPropertyValue('grid-template-columns')", columnValue);
Julien - ping for review 2014/10/10 18:09:16 Shouldn't this be window.gridElement? (gridId is d
+}
+
+checkColumns("gridFixedAndMinContentAndFlex", "20px 30px 50px");
+checkColumns("gridFixedAndMinContentAndFlexMultipleOverlap", "20px 10px 70px");
+checkColumns("gridMinMaxFixedFlexAndMaxContentAndAuto", "60px 20px 20px");
+checkColumns("gridMinMaxFixedFlexAndMaxContentAndAutoNoFlexSpanningItems", "100px 0px 0px");
+checkColumns("gridMinMaxFlexFixedAndMinContentAndFixed", "35px 5px 25px");
+checkColumns("gridMinContentAndMinMaxFixedMinContentAndFlex", "20px 20px 60px");
+checkColumns("gridMaxContentAndMinMaxFixedMaxContentAndFlex", "70px 20px 10px");
+
+</script>
+</html>
« no previous file with comments | « no previous file | LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns-expected.txt » ('j') | Source/core/rendering/RenderGrid.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698