[css-grid] Cleanup LayoutGrid::Grid

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

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 327 matching lines @@
 
   // TODO(svillar): move into this class once GridIterator is added.
   typedef Vector<Vector<GridCell>> GridAsMatrix;
   class Grid final {
    public:
     Grid(LayoutGrid* grid) : m_orderIterator(grid) {}
 
     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);
 
     GridSpan gridItemSpan(const LayoutBox&, GridTrackSizingDirection) const;
 
     size_t gridItemPaintOrder(const LayoutBox& item) const;
     void setGridItemPaintOrder(const LayoutBox& item, size_t order);
 
     const GridCell& cell(size_t row, size_t column) const {
@@ skipping 28 matching lines @@
     friend class GridIterator;
 
     OrderIterator m_orderIterator;
 
     int m_smallestColumnStart{0};
     int m_smallestRowStart{0};
 
     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;
     HashMap<const LayoutBox*, size_t> m_gridItemsIndexesMap;
 
     std::unique_ptr<OrderedTrackIndexSet> m_autoRepeatEmptyColumns{nullptr};
     std::unique_ptr<OrderedTrackIndexSet> m_autoRepeatEmptyRows{nullptr};
   };
   Grid m_grid;
 
   bool m_gridIsDirty;
   Vector<LayoutUnit> m_rowPositions;
   Vector<LayoutUnit> m_columnPositions;
   LayoutUnit m_offsetBetweenColumns;
   LayoutUnit m_offsetBetweenRows;
   Vector<LayoutBox*> m_gridItemsOverflowingGridArea;
 
   LayoutUnit m_minContentHeight{-1};
   LayoutUnit m_maxContentHeight{-1};
 
   Optional<bool> m_hasDefiniteLogicalHeight;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid());
 
 }  // namespace blink
 
 #endif  // LayoutGrid_h