Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(669)

Unified Diff: Source/core/rendering/RenderGrid.h

Issue 18516007: Add support for 'order' on grid items (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Squashed the 2 constructors per Ojan's review comment Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/OrderIterator.cpp ('k') | Source/core/rendering/RenderGrid.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderGrid.h
diff --git a/Source/core/rendering/RenderGrid.h b/Source/core/rendering/RenderGrid.h
index 074f8597bb85d60d552590662bb2605f4d1805aa..f907101e280859152213755f75f799a9f303a784 100644
--- a/Source/core/rendering/RenderGrid.h
+++ b/Source/core/rendering/RenderGrid.h
@@ -26,6 +26,7 @@
#ifndef RenderGrid_h
#define RenderGrid_h
+#include "core/rendering/OrderIterator.h"
#include "core/rendering/RenderBlock.h"
namespace WebCore {
@@ -72,6 +73,7 @@ private:
void insertItemIntoGrid(RenderBox*, size_t rowTrack, size_t columnTrack);
void insertItemIntoGrid(RenderBox*, const GridCoordinate&);
void placeItemsOnGrid();
+ void populateExplicitGridAndOrderIterator();
void placeSpecifiedMajorAxisItemsOnGrid(Vector<RenderBox*>);
void placeAutoMajorAxisItemsOnGrid(Vector<RenderBox*>);
void placeAutoMajorAxisItemOnGrid(RenderBox*);
@@ -94,7 +96,6 @@ private:
size_t explicitGridColumnCount() const;
size_t explicitGridRowCount() const;
size_t explicitGridSizeForSide(GridPositionSide) const;
- size_t maximumIndexInDirection(TrackSizingDirection) const;
LayoutUnit logicalContentHeightForChild(RenderBox*, Vector<GridTrack>&);
LayoutUnit minContentForChild(RenderBox*, TrackSizingDirection, Vector<GridTrack>& columnTracks);
@@ -110,6 +111,8 @@ private:
LayoutUnit gridAreaBreadthForChild(const RenderBox* child, TrackSizingDirection, const Vector<GridTrack>&) const;
+ virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
+
#ifndef NDEBUG
bool tracksAreWiderThanMinTrackBreadth(TrackSizingDirection, const Vector<GridTrack>&);
bool gridWasPopulated() const { return !m_grid.isEmpty() && !m_grid[0].isEmpty(); }
@@ -128,6 +131,7 @@ private:
Vector<Vector<Vector<RenderBox*, 1> > > m_grid;
HashMap<const RenderBox*, GridCoordinate> m_gridItemCoordinate;
+ OrderIterator m_orderIterator;
};
} // namespace WebCore
« no previous file with comments | « Source/core/rendering/OrderIterator.cpp ('k') | Source/core/rendering/RenderGrid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698