Changeset 169277 in webkit

Timestamp:

May 23, 2014 1:31:21 PM (10 years ago)

Author:

Manuel Rego Casasnovas

Message:

[CSS Grid Layout] Use gridRowCount() and gridColumnCount() when possible
​https://bugs.webkit.org/show_bug.cgi?id=133213

Reviewed by Sergio Villar Senin.

Use gridRowCount() and gridColumnCount() instead of m_grid.size() and
m_grid[0].size() to make the code more descriptive and easier to
understand.

No new tests (No change in behavior).

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::growGrid):
(WebCore::RenderGrid::placeAutoMajorAxisItemOnGrid):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-23  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [CSS Grid Layout] Use gridRowCount() and gridColumnCount() when possible
+        https://bugs.webkit.org/show_bug.cgi?id=133213
+
+        Reviewed by Sergio Villar Senin.
+
+        Use gridRowCount() and gridColumnCount() instead of m_grid.size() and
+        m_grid[0].size() to make the code more descriptive and easier to
+        understand.
+
+        No new tests (No change in behavior).
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::growGrid):
+        (WebCore::RenderGrid::placeAutoMajorAxisItemOnGrid):
+
 2014-05-23  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -631 +631 @@
 {
     if (direction == ForColumns) {
-        const size_t oldColumnSize = m_grid[0].size();
-        for (size_t row = 0; row < m_grid.size(); ++row)
+        const size_t oldColumnSize = gridColumnCount();
+        for (size_t row = 0; row < gridRowCount(); ++row)
             m_grid[row].grow(oldColumnSize + 1);
     } else {
-        const size_t oldRowSize = m_grid.size();
+        const size_t oldRowSize = gridRowCount();
         m_grid.grow(oldRowSize + 1);
-        m_grid[oldRowSize].grow(m_grid[0].size());
+        m_grid[oldRowSize].grow(gridColumnCount());
     }
 }
@@ -777 +777 @@
 
     // We didn't find an empty grid area so we need to create an extra major axis line and insert our gridItem in it.
-    const size_t columnIndex = (autoPlacementMajorAxisDirection() == ForColumns) ? m_grid[0].size() : minorAxisIndex;
-    const size_t rowIndex = (autoPlacementMajorAxisDirection() == ForColumns) ? minorAxisIndex : m_grid.size();
+    const size_t columnIndex = (autoPlacementMajorAxisDirection() == ForColumns) ? gridColumnCount() : minorAxisIndex;
+    const size_t rowIndex = (autoPlacementMajorAxisDirection() == ForColumns) ? minorAxisIndex : gridRowCount();
     growGrid(autoPlacementMajorAxisDirection());
     insertItemIntoGrid(gridItem, rowIndex, columnIndex);