Changeset 203785 in webkit

Timestamp:

Jul 27, 2016 11:46:42 AM (8 years ago)

Author:

jfernandez@igalia.com

Message:

[css-grid] The isValidTransition function must not alter the GridSizingData object
​https://bugs.webkit.org/show_bug.cgi?id=160252

Reviewed by Darin Adler.

It's not correct that a function which purpose is to check out the
validity of a state modifies such state.

That code was there to allow the extra row track sizing iteration
in the case of a grid container with indefinite height. We need to
do that in order to figure out its intrinsic height, which will be
used then to properly sizing the row tracks.

Since the intrinsic height computation uses directly the
computeUsedBreadthOfGridTracks function, it does not alter the
algorithm state-machine, hence, we can safely remove this code,
which was incorrect in any case.

No new tests, it's just a refactoring with no functionality change.

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::GridSizingData::isValidTransition):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderGrid.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-07-27  Javier Fernandez  <jfernandez@igalia.com>
+
+        [css-grid] The isValidTransition function must not alter the GridSizingData object
+        https://bugs.webkit.org/show_bug.cgi?id=160252
+
+        Reviewed by Darin Adler.
+
+        It's not correct that a function which purpose is to check out the
+        validity of a state modifies such state.
+
+        That code was there to allow the extra row track sizing iteration
+        in the case of a grid container with indefinite height. We need to
+        do that in order to figure out its intrinsic height, which will be
+        used then to properly sizing the row tracks.
+
+        Since the intrinsic height computation uses directly the
+        computeUsedBreadthOfGridTracks function, it does not alter the
+        algorithm state-machine, hence, we can safely remove this code,
+        which was incorrect in any case.
+
+        No new tests, it's just a refactoring with no functionality change.
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::GridSizingData::isValidTransition):
+
 2016-07-27  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -262 +262 @@
         sizingState = ColumnSizingFirstIteration;
     }
-    bool isValidTransition(GridTrackSizingDirection direction)
+    bool isValidTransition(GridTrackSizingDirection direction) const
     {
         switch (sizingState) {
         case ColumnSizingFirstIteration:
+        case ColumnSizingSecondIteration:
             return direction == ForColumns;
         case RowSizingFirstIteration:
-            return direction == ForRows;
-        case ColumnSizingSecondIteration:
-            if (direction == ForRows)
-                sizingState = RowSizingFirstIteration;
-            return true;
         case RowSizingSecondIteration:
             return direction == ForRows;