Changeset 205954 in webkit

Timestamp:

Sep 15, 2016 12:40:20 AM (8 years ago)

Author:

svillar@igalia.com

Message:

[css-grid] Too many gaps with trailing collapsing tracks
​https://bugs.webkit.org/show_bug.cgi?id=161905

Reviewed by Darin Adler.

Source/WebCore:

The total number and size of gaps were incorrectly computed whenever there were trailing
collapsed tracks (with collapsed gaps). The problem was that we were trying to optimize too
much the amount of hash table queries required to know the gaps between two lines. We were
considering that a gap always exist between 2 consecutive tracks if the first one is not
empty. That's generally true (for both NOTEMPTY|NOTEMPTY and NOTEMPTY|EMPTY+|NOTEMPTY
sequences) but not for all the cases (NOTEMPTY|EMPTY+).

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::guttersSize):

LayoutTests:

Added new test cases to check that trailing collapsed tracks do not add gutters at the end.

• fast/css-grid-layout/grid-auto-fit-columns-expected.txt:
• fast/css-grid-layout/grid-auto-fit-columns.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/grid-auto-fit-columns-expected.txt (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/grid-auto-fit-columns.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderGrid.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-13  Sergio Villar Senin  <svillar@igalia.com>
+
+        [css-grid] Too many gaps with trailing collapsing tracks
+        https://bugs.webkit.org/show_bug.cgi?id=161905
+
+        Reviewed by Darin Adler.
+
+        Added new test cases to check that trailing collapsed tracks do not add gutters at the end.
+
+        * fast/css-grid-layout/grid-auto-fit-columns-expected.txt:
+        * fast/css-grid-layout/grid-auto-fit-columns.html:
+
 2016-09-15  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/fast/css-grid-layout/grid-auto-fit-columns-expected.txt

@@ -30 +30 @@
 PASS
 PASS
+PASS
+PASS

trunk/LayoutTests/fast/css-grid-layout/grid-auto-fit-columns.html

@@ -19 +19 @@
 .gridMultipleNames { grid-template-columns: [start] 20px [foo] 50% repeat(auto-fit, [bar] 20px [start foo]) [foo] 10% [end bar]; }
 .gridMultipleTracks { grid-template-columns: [start] 20px repeat(auto-fit, [a] 2em [b c] 10% [d]) [e] minmax(75px, 1fr) [last]; }
+.gridMinMaxFixedFlex { grid-template-columns: repeat(auto-fit, minmax(50px, 1fr)); }
 
 .item { background-color: cyan; }
@@ -151 +152 @@
 </div>
 
+<div class="grid gridMinMaxFixedFlex gap">
+    <div class="item" style="grid-column-start: 1" data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridMinMaxFixedFlex gap">
+    <div class="item" style="grid-column-start: 1" data-offset-x="0" data-offset-y="0" data-expected-width="90" data-expected-height="25"></div>
+    <div class="item" style="grid-column-start: 2" data-offset-x="110" data-offset-y="0" data-expected-width="90" data-expected-height="25"></div>
+</div>
+
 </body>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-13  Sergio Villar Senin  <svillar@igalia.com>
+
+        [css-grid] Too many gaps with trailing collapsing tracks
+        https://bugs.webkit.org/show_bug.cgi?id=161905
+
+        Reviewed by Darin Adler.
+
+        The total number and size of gaps were incorrectly computed whenever there were trailing
+        collapsed tracks (with collapsed gaps). The problem was that we were trying to optimize too
+        much the amount of hash table queries required to know the gaps between two lines. We were
+        considering that a gap always exist between 2 consecutive tracks if the first one is not
+        empty. That's generally true (for both NOTEMPTY|NOTEMPTY and NOTEMPTY|EMPTY+|NOTEMPTY
+        sequences) but not for all the cases (NOTEMPTY|EMPTY+).
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::guttersSize):
+
 2016-09-15  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -545 +545 @@
         if (!isEmptyAutoRepeatTrack(direction, line))
             gapAccumulator += gap;
+    }
+
+    // The above loop adds one extra gap for trailing collapsed tracks.
+    if (gapAccumulator && isEmptyAutoRepeatTrack(direction, endLine - 1)) {
+        ASSERT(gapAccumulator >= gap);
+        gapAccumulator -= gap;
     }