Index: third_party/WebKit/Source/core/layout/LayoutGrid.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp |
index bd8979ab203b0323eba79b481873d18ef48f7ffd..7a9dd5b05378dd2bba2727f80acf0c27c8af5115 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp |
@@ -105,7 +105,7 @@ void LayoutGrid::Grid::setGridItemPaintOrder(const LayoutBox& item, |
m_gridItemsIndexesMap.set(&item, order); |
} |
-#if ENABLE(ASSERT) |
+#if DCHECK_IS_ON() |
bool LayoutGrid::Grid::hasAnyGridItemPaintOrder() const { |
return !m_gridItemsIndexesMap.isEmpty(); |
} |
@@ -836,7 +836,7 @@ void LayoutGrid::computeTrackSizesForIndefiniteSize( |
minIntrinsicSize += totalGuttersSize; |
maxIntrinsicSize += totalGuttersSize; |
-#if ENABLE(ASSERT) |
+#if DCHECK_IS_ON() |
DCHECK(tracksAreWiderThanMinTrackBreadth(direction, sizingData)); |
#endif |
} |
@@ -1922,7 +1922,7 @@ void LayoutGrid::distributeSpaceToTracks( |
: std::max(track->plannedSize(), track->sizeDuringDistribution())); |
} |
-#if ENABLE(ASSERT) |
+#if DCHECK_IS_ON() |
bool LayoutGrid::tracksAreWiderThanMinTrackBreadth( |
GridTrackSizingDirection direction, |
GridSizingData& sizingData) const { |
@@ -2100,7 +2100,7 @@ void LayoutGrid::placeItemsOnGrid(LayoutGrid::Grid& grid, |
Vector<LayoutBox*> autoMajorAxisAutoGridItems; |
Vector<LayoutBox*> specifiedMajorAxisAutoGridItems; |
-#if ENABLE(ASSERT) |
+#if DCHECK_IS_ON() |
DCHECK(!grid.hasAnyGridItemPaintOrder()); |
#endif |
DCHECK(!grid.hasAnyOrthogonalGridItem()); |
@@ -2136,7 +2136,7 @@ void LayoutGrid::placeItemsOnGrid(LayoutGrid::Grid& grid, |
} |
grid.setHasAnyOrthogonalGridItem(hasAnyOrthogonalGridItem); |
-#if ENABLE(ASSERT) |
+#if DCHECK_IS_ON() |
if (grid.hasGridItems()) { |
DCHECK_GE(grid.numTracks(ForRows), |
GridPositionsResolver::explicitGridRowCount( |
@@ -2157,7 +2157,7 @@ void LayoutGrid::placeItemsOnGrid(LayoutGrid::Grid& grid, |
grid.setNeedsItemsPlacement(false); |
-#if ENABLE(ASSERT) |
+#if DCHECK_IS_ON() |
for (LayoutBox* child = grid.orderIterator().first(); child; |
child = grid.orderIterator().next()) { |
if (child->isOutOfFlowPositioned()) |
@@ -2564,7 +2564,7 @@ void LayoutGrid::layoutGridItems(GridSizingData& sizingData) { |
updateAutoMarginsInRowAxisIfNeeded(*child); |
const GridArea& area = sizingData.grid().gridItemArea(*child); |
-#if ENABLE(ASSERT) |
+#if DCHECK_IS_ON() |
ASSERT(area.columns.startLine() < sizingData.columnTracks.size()); |
ASSERT(area.rows.startLine() < sizingData.rowTracks.size()); |
#endif |