[css-grid] Cleanup LayoutGrid::Grid

third_party/WebKit/Source/core/layout/LayoutGrid.h

Index: third_party/WebKit/Source/core/layout/LayoutGrid.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.h b/third_party/WebKit/Source/core/layout/LayoutGrid.h
index 3fe38083260ddb7b5642c9fff26cad6f4219bc61..5c8f626b1c38031b2640dc2ce8c731b71121f871 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.h
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.h
@@ -345,10 +345,15 @@ class LayoutGrid final : public LayoutBlock {
     size_t numTracks(GridTrackSizingDirection) const;
 
     void ensureGridSize(size_t maximumRowSize, size_t maximumColumnSize);
-    void insert(LayoutBox&, const GridArea&, bool isOrthogonalChild);
+    void insert(LayoutBox&, const GridArea&);
 
-    bool hasInFlowGridItems() const { return !m_gridItemArea.isEmpty(); }
-    bool hasAnyOrthogonalChildren() const { return m_hasAnyOrthogonalChildren; }
+    // Note that out of flow children are not grid items.
+    bool hasGridItems() const { return !m_gridItemArea.isEmpty(); }

[Manuel Rego, 2016/11/25 18:23:25]

Nit: Maybe we could have a isEmpty() method. Not 100% sure
as it might be confusing due to the out-of-flow
and in-flow children.

[svillar, 2016/11/28 11:21:25]

I don't think we need that. We could always check the existence of children
using the LayoutBox methods.

[Manuel Rego, 2016/11/28 11:46:04]

It's clear I choose a bad name, I was thinking in:
  bool isEmpty() const { return m_gridItemArea.isEmpty(); }

+
+    // TODO(svillar): move this to SizingData once it's passed to
+    // placeItemsOnGrid.
+    bool hasAnyOrthogonalGridItem() const { return m_hasAnyOrthogonalGridItem; }
+    void setHasAnyOrthogonalGridItem(bool);
 
     GridArea gridItemArea(const LayoutBox& item) const;
     void setGridItemArea(const LayoutBox& item, GridArea);
@@ -397,7 +402,7 @@ class LayoutGrid final : public LayoutBlock {
     size_t m_autoRepeatColumns{0};
     size_t m_autoRepeatRows{0};
 
-    bool m_hasAnyOrthogonalChildren{false};
+    bool m_hasAnyOrthogonalGridItem{false};
     GridAsMatrix m_grid;
 
     HashMap<const LayoutBox*, GridArea> m_gridItemArea;