Attachment 369843 Details for Bug 197854 – Patch for landing

[patch] Patch for landing

bug-197854-20190514163348.patch (text/plain), 27.96 KB, created by Manuel Rego Casasnovas on 2019-05-14 07:33:50 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Manuel Rego Casasnovas

Created: 2019-05-14 07:33:50 PDT

Size: 27.96 KB

patch

obsolete

>Subversion Revision: 245248
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 8848d916c96fc9f5bcef74dd9b26f80cd7b61e43..022d0c37327f9c41e9991e3f0d96e50d0545bd20 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,31 @@
>+2019-05-13  Manuel Rego Casasnovas  <rego@igalia.com>
>+
>+        [css-grid] Use max size to compute auto repeat tracks
>+        https://bugs.webkit.org/show_bug.cgi?id=197854
>+
>+        Reviewed by Javier Fernandez.
>+
>+        When available size is indefinite we should use max size to compute the number of auto repeat tracks.
>+
>+        The spec text is very clear (https://drafts.csswg.org/css-grid/#auto-repeat):
>+        > When auto-fill is given as the repetition number, if the grid container
>+        > has a definite size or **max size** in the relevant axis...
>+
>+        So far we were not doing that for widths, in this patch we modify RenderGrid::computeAutoRepeatTracksCount()
>+        to do the same than for heights.
>+
>+        We also take advantage to fix problems related to min|max sizes and box-sizing property,
>+        that were inconsistent for columns and rows.
>+
>+        Tests: imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html
>+               imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html
>+               imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html
>+               imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html
>+               imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html
>+
>+        * rendering/RenderGrid.cpp:
>+        (WebCore::RenderGrid::computeAutoRepeatTracksCount const):
>+
> 2019-05-13  Antti Koivisto  <antti@apple.com>
> 
>         REGRESSION (r245208): compositing/shared-backing/sharing-bounds-non-clipping-shared-layer.html asserts
>diff --git a/Source/WebCore/rendering/RenderGrid.cpp b/Source/WebCore/rendering/RenderGrid.cpp
>index 760a03276282b0de95a761c6e5d0b93e39a3265b..e35a2c13225d4725cd88c22f6d04ccc9d0f3497f 100644
>--- a/Source/WebCore/rendering/RenderGrid.cpp
>+++ b/Source/WebCore/rendering/RenderGrid.cpp
>@@ -456,24 +456,33 @@ unsigned RenderGrid::computeAutoRepeatTracksCount(GridTrackSizingDirection direc
>     if (!autoRepeatTrackListLength)
>         return 0;
> 
>-    if (!isRowAxis && !availableSize) {
>-        const Length& maxLength = style().logicalMaxHeight();
>-        if (!maxLength.isUndefined()) {
>-            availableSize = computeContentLogicalHeight(MaxSize, maxLength, WTF::nullopt);
>-            if (availableSize)
>-                availableSize = constrainContentBoxLogicalHeightByMinMax(availableSize.value(), WTF::nullopt);
>-        }
>-    }
>-
>     bool needsToFulfillMinimumSize = false;
>     if (!availableSize) {
>+        const Length& maxSize = isRowAxis ? style().logicalMaxWidth() : style().logicalMaxHeight();
>+        Optional<LayoutUnit> containingBlockAvailableSize;
>+        Optional<LayoutUnit> availableMaxSize;
>+        if (maxSize.isSpecified()) {
>+            if (maxSize.isPercentOrCalculated())
>+                containingBlockAvailableSize = isRowAxis ? containingBlockLogicalWidthForContent() : containingBlockLogicalHeightForContent(ExcludeMarginBorderPadding);
>+            LayoutUnit maxSizeValue = valueForLength(maxSize, containingBlockAvailableSize.valueOr(LayoutUnit()));
>+            availableMaxSize = isRowAxis ? adjustContentBoxLogicalWidthForBoxSizing(maxSizeValue) : adjustContentBoxLogicalHeightForBoxSizing(maxSizeValue);
>+        }
>+
>         const Length& minSize = isRowAxis ? style().logicalMinWidth() : style().logicalMinHeight();
>-        if (!minSize.isSpecified())
>+        if (!availableMaxSize && !minSize.isSpecified())
>             return autoRepeatTrackListLength;
> 
>-        LayoutUnit containingBlockAvailableSize = isRowAxis ? containingBlockLogicalWidthForContent() : containingBlockLogicalHeightForContent(ExcludeMarginBorderPadding);
>-        availableSize = valueForLength(minSize, containingBlockAvailableSize);
>-        needsToFulfillMinimumSize = true;
>+        Optional<LayoutUnit> availableMinSize;
>+        if (minSize.isSpecified()) {
>+            if (!containingBlockAvailableSize && minSize.isPercentOrCalculated())
>+                containingBlockAvailableSize = isRowAxis ? containingBlockLogicalWidthForContent() : containingBlockLogicalHeightForContent(ExcludeMarginBorderPadding);
>+            LayoutUnit minSizeValue = valueForLength(minSize, containingBlockAvailableSize.valueOr(LayoutUnit()));
>+            availableMinSize = isRowAxis ? adjustContentBoxLogicalWidthForBoxSizing(minSizeValue) : adjustContentBoxLogicalHeightForBoxSizing(minSizeValue);
>+            if (!maxSize.isSpecified())
>+                needsToFulfillMinimumSize = true;
>+        }
>+
>+        availableSize = std::max(availableMinSize.valueOr(LayoutUnit()), availableMaxSize.valueOr(LayoutUnit()));
>     }
> 
>     LayoutUnit autoRepeatTracksSize;
>diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
>index 0a05cee769733eda7e6c1e7b1324c0e23d54988d..1c28b732679f644ce631d27cb84fe505029908ab 100644
>--- a/LayoutTests/imported/w3c/ChangeLog
>+++ b/LayoutTests/imported/w3c/ChangeLog
>@@ -1,3 +1,24 @@
>+2019-05-13  Manuel Rego Casasnovas  <rego@igalia.com>
>+
>+        [css-grid] Use max size to compute auto repeat tracks
>+        https://bugs.webkit.org/show_bug.cgi?id=197854
>+
>+        Reviewed by Javier Fernandez.
>+
>+        Imported WPT tests for this bug.
>+
>+        * web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001-expected.txt: Added.
>+        * web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html: Added.
>+        * web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002-expected.txt: Added.
>+        * web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html: Added.
>+        * web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001-expected.txt: Added.
>+        * web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html: Added.
>+        * web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001-expected.txt: Added.
>+        * web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html: Added.
>+        * web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002-expected.txt: Added.
>+        * web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html: Added.
>+        * web-platform-tests/css/css-grid/grid-definition/w3c-import.log:
>+
> 2019-05-07  Antoine Quint  <graouts@apple.com>
> 
>         [Pointer Events] isPrimary property of pointercancel events should match previous events for that pointer
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..b2203fa59d614faee6d0161cfc5900b73ad306bc
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001-expected.txt
>@@ -0,0 +1,14 @@
>+
>+PASS .grid 1 
>+PASS .grid 2 
>+PASS .grid 3 
>+PASS .grid 4 
>+PASS .grid 5 
>+PASS .grid 6 
>+PASS .grid 7 
>+PASS .grid 8 
>+PASS .grid 9 
>+PASS .grid 10 
>+PASS .grid 11 
>+PASS .grid 12 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..e14f37ade0d136c7a0bbe2c45c42f43ef258abe9
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html
>@@ -0,0 +1,84 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Grid Layout Test: Auto repeat tracks and max sizes</title>
>+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
>+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat">
>+<meta name="assert" content="This test checks that auto repeat tracks use max size when size is indefinite to compute the number of tracks.">
>+<link rel="stylesheet" href="support/grid.css">
>+<style>
>+.grid {
>+  position: relative;
>+  display: grid;
>+  grid: repeat(auto-fill, 50px) / repeat(auto-fill, 100px);
>+  max-width: 300px;
>+  max-height: 200px;
>+}
>+.border {
>+  border: 10px solid;
>+}
>+.border-box {
>+  box-sizing: border-box;
>+}
>+.item {
>+  background: lime;
>+  /* Place item on the last cell. */
>+  grid-column: -2;
>+  grid-row: -2;
>+}
>+</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" data-expected-width="300" data-expected-height="200">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid" style="width: 200px; height: 100px;" data-expected-width="200" data-expected-height="100">
>+  <div class="item" data-offset-x="100" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid" style="width: min-content; height: min-content;" data-expected-width="300" data-expected-height="200">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid" style="width: max-content; height: max-content;" data-expected-width="300" data-expected-height="200">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border" data-expected-width="320" data-expected-height="220">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border" style="width: 200px; height: 100px;" data-expected-width="220" data-expected-height="120">
>+  <div class="item" data-offset-x="100" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border" style="width: min-content; height: min-content;" data-expected-width="320" data-expected-height="220">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border" style="width: max-content; height: max-content;" data-expected-width="320" data-expected-height="220">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border border-box" data-expected-width="300" data-expected-height="170">
>+  <div class="item" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border border-box" style="width: 200px; height: 100px;" data-expected-width="200" data-expected-height="100">
>+  <div class="item" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border border-box" style="width: min-content; height: min-content;" data-expected-width="220" data-expected-height="170">
>+  <div class="item" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border border-box" style="width: max-content; height: max-content;" data-expected-width="220" data-expected-height="170">
>+  <div class="item" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+</body>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..aa08e811fe4dd02893c377d1ab4cc140136e0051
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002-expected.txt
>@@ -0,0 +1,6 @@
>+
>+PASS .grid 1 
>+PASS .grid 2 
>+PASS .grid 3 
>+PASS .grid 4 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..0f8c860a282138d3785a512dd713c23ee37448dc
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html
>@@ -0,0 +1,58 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Grid Layout Test: Auto repeat tracks and percentage max sizes</title>
>+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
>+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat">
>+<meta name="assert" content="This test checks that auto repeat tracks use percentage max size when size is indefinite to compute the number of tracks.">
>+<link rel="stylesheet" href="support/grid.css">
>+<style>
>+.grid {
>+  position: relative;
>+  display: grid;
>+  grid: repeat(auto-fill, 50px) / repeat(auto-fill, 100px);
>+  max-width: 50%;
>+  max-height: 80%;
>+}
>+.wrapper {
>+  width: 600px;
>+  height: 250px;
>+}
>+.item {
>+  background: lime;
>+  /* Place item on the last cell. */
>+  grid-column: -2;
>+  grid-row: -2;
>+}
>+</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="wrapper">
>+  <div class="grid" data-expected-width="300" data-expected-height="200">
>+    <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+  </div>
>+</div>
>+
>+<div class="wrapper">
>+  <div class="grid" style="width: 200px; height: 100px;" data-expected-width="200" data-expected-height="100">
>+    <div class="item" data-offset-x="100" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
>+  </div>
>+</div>
>+
>+<div class="wrapper">
>+  <div class="grid" style="width: min-content; height: min-content;" data-expected-width="300" data-expected-height="200">
>+    <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+  </div>
>+</div>
>+
>+<div class="wrapper">
>+  <div class="grid" style="width: max-content; height: max-content;" data-expected-width="300" data-expected-height="200">
>+    <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+  </div>
>+</div>
>+
>+</body>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..aa08e811fe4dd02893c377d1ab4cc140136e0051
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001-expected.txt
>@@ -0,0 +1,6 @@
>+
>+PASS .grid 1 
>+PASS .grid 2 
>+PASS .grid 3 
>+PASS .grid 4 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..e9d1fded1ecc556aab0b96d7b82b6e793325951b
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html
>@@ -0,0 +1,55 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Grid Layout Test: Auto repeat tracks with min and max sizes</title>
>+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
>+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat">
>+<meta name="assert" content="This test checks that auto repeat tracks don't overflow the grid container size when max size is definite, even if min size is bigger than that.">
>+<link rel="stylesheet" href="support/grid.css">
>+<style>
>+.grid {
>+  position: relative;
>+  display: grid;
>+  grid: repeat(auto-fill, 50px) / repeat(auto-fill, 100px);
>+  max-width: 100px;
>+  min-width: 250px;
>+  max-height: 50px;
>+  min-height: 125px;
>+  float: left;
>+}
>+.border {
>+  border: 10px solid;
>+}
>+.border-box {
>+  box-sizing: border-box;
>+}
>+.item {
>+  background: lime;
>+  /* Place item on the last cell. */
>+  grid-column: -2;
>+  grid-row: -2;
>+}
>+</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" data-expected-width="250" data-expected-height="125">
>+  <div class="item" data-offset-x="100" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid" style="width: 200px; height: 100px;" data-expected-width="250" data-expected-height="125">
>+  <div class="item" data-offset-x="100" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid" style="width: min-content; height: min-content;" data-expected-width="250" data-expected-height="125">
>+  <div class="item" data-offset-x="100" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid" style="width: max-content; height: max-content;" data-expected-width="250" data-expected-height="125">
>+  <div class="item" data-offset-x="100" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+</body>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..b2203fa59d614faee6d0161cfc5900b73ad306bc
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001-expected.txt
>@@ -0,0 +1,14 @@
>+
>+PASS .grid 1 
>+PASS .grid 2 
>+PASS .grid 3 
>+PASS .grid 4 
>+PASS .grid 5 
>+PASS .grid 6 
>+PASS .grid 7 
>+PASS .grid 8 
>+PASS .grid 9 
>+PASS .grid 10 
>+PASS .grid 11 
>+PASS .grid 12 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..08d5ff82f299ca4764a7119784e4dc1c14cdadb4
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html
>@@ -0,0 +1,85 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Grid Layout Test: Auto repeat tracks and min sizes</title>
>+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
>+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat">
>+<meta name="assert" content="This test checks that auto repeat tracks use min size when available to compute the number of tracks.">
>+<link rel="stylesheet" href="support/grid.css">
>+<style>
>+.grid {
>+  position: relative;
>+  display: grid;
>+  grid: repeat(auto-fill, 50px) / repeat(auto-fill, 100px);
>+  min-width: 300px;
>+  min-height: 200px;
>+  float: left;
>+}
>+.border {
>+  border: 10px solid;
>+}
>+.border-box {
>+  box-sizing: border-box;
>+}
>+.item {
>+  background: lime;
>+  /* Place item on the last cell. */
>+  grid-column: -2;
>+  grid-row: -2;
>+}
>+</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" data-expected-width="300" data-expected-height="200">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid" style="width: 200px; height: 100px;" data-expected-width="300" data-expected-height="200">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid" style="width: min-content; height: min-content;" data-expected-width="300" data-expected-height="200">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid" style="width: max-content; height: max-content;" data-expected-width="300" data-expected-height="200">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border" data-expected-width="320" data-expected-height="220">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border" style="width: 200px; height: 100px;" data-expected-width="320" data-expected-height="220">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border" style="width: min-content; height: min-content;" data-expected-width="320" data-expected-height="220">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border" style="width: max-content; height: max-content;" data-expected-width="320" data-expected-height="220">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border border-box" data-expected-width="320" data-expected-height="220">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border border-box" style="width: 200px; height: 100px;" data-expected-width="300" data-expected-height="200">
>+  <div class="item" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border border-box" style="width: min-content; height: min-content;" data-expected-width="320" data-expected-height="220">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+<div class="grid border border-box" style="width: max-content; height: max-content;" data-expected-width="320" data-expected-height="220">
>+  <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+</div>
>+
>+</body>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..aa08e811fe4dd02893c377d1ab4cc140136e0051
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002-expected.txt
>@@ -0,0 +1,6 @@
>+
>+PASS .grid 1 
>+PASS .grid 2 
>+PASS .grid 3 
>+PASS .grid 4 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..5fe4f33b51cac91a726e0e5632d58c15cb211a27
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html
>@@ -0,0 +1,59 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Grid Layout Test: Auto repeat tracks and percentage min sizes</title>
>+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
>+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat">
>+<meta name="assert" content="This test checks that auto repeat tracks use percentage min size when available to compute the number of tracks.">
>+<link rel="stylesheet" href="support/grid.css">
>+<style>
>+.grid {
>+  position: relative;
>+  display: grid;
>+  grid: repeat(auto-fill, 50px) / repeat(auto-fill, 100px);
>+  min-width: 50%;
>+  min-height: 80%;
>+  float: left;
>+}
>+.wrapper {
>+  width: 600px;
>+  height: 250px;
>+}
>+.item {
>+  background: lime;
>+  /* Place item on the last cell. */
>+  grid-column: -2;
>+  grid-row: -2;
>+}
>+</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="wrapper">
>+  <div class="grid" data-expected-width="300" data-expected-height="200">
>+    <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+  </div>
>+</div>
>+
>+<div class="wrapper">
>+  <div class="grid" style="width: 200px; height: 100px;" data-expected-width="300" data-expected-height="200">
>+    <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+  </div>
>+</div>
>+
>+<div class="wrapper">
>+  <div class="grid" style="width: min-content; height: min-content;" data-expected-width="300" data-expected-height="200">
>+    <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+  </div>
>+</div>
>+
>+<div class="wrapper">
>+  <div class="grid" style="width: max-content; height: max-content;" data-expected-width="300" data-expected-height="200">
>+    <div class="item" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
>+  </div>
>+</div>
>+
>+</body>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/w3c-import.log
>index f7045c3743bfcad141ac4a2d7520e167437287d2..7e0710a41fb09219d1ca8a4fea7bf28dddb68d0f 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/w3c-import.log
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/w3c-import.log
>@@ -18,6 +18,11 @@ List of files:
> /LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/fr-unit-with-percentage-expected.html
> /LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/fr-unit-with-percentage.html
> /LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/fr-unit.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html
> /LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-change-fit-content-argument-001.html
> /LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-inline-auto-repeat-001.html
> /LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-inline-support-flexible-lengths-001.html

Actions: View | Formatted Diff | Diff

Attachments on bug 197854: 369784 | 369790 | 369826 | 369843