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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutGrid.cpp

Issue 2770123003: Replace ASSERT with DCHECK in core/layout/ excluding subdirs (Closed)
Patch Set: Split some DCHECKs and add DCHECK_ops wherever possible Created 3 years, 8 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
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 d97816e9b8c5b900599694276d4a6a41a7cf8e7e..36e2c84f9aa7c0334485aba45e07622e13efb3dd 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
@@ -55,7 +55,7 @@ struct ContentAlignmentData {
LayoutGrid::LayoutGrid(Element* element)
: LayoutBlock(element), m_grid(this), m_trackSizingAlgorithm(this, m_grid) {
- ASSERT(!childrenInline());
+ DCHECK(!childrenInline());
if (!isAnonymous())
UseCounter::count(document(), UseCounter::CSSGridLayout);
}
@@ -184,7 +184,7 @@ void LayoutGrid::repeatTracksSizingIfNeeded(LayoutUnit availableSpaceForColumns,
}
void LayoutGrid::layoutBlock(bool relayoutChildren) {
- ASSERT(needsLayout());
+ DCHECK(needsLayout());
// We cannot perform a simplifiedLayout() on a dirty grid that
// has positioned items to be laid out.
@@ -701,8 +701,8 @@ void LayoutGrid::placeItemsOnGrid(Grid& grid,
continue;
GridArea area = grid.gridItemArea(*child);
- ASSERT(area.rows.isTranslatedDefinite() &&
- area.columns.isTranslatedDefinite());
+ DCHECK(area.rows.isTranslatedDefinite());
+ DCHECK(area.columns.isTranslatedDefinite());
}
#endif
}
@@ -804,7 +804,7 @@ void LayoutGrid::placeSpecifiedMajorAxisItemsOnGrid(
for (const auto& autoGridItem : autoGridItems) {
GridSpan majorAxisPositions =
grid.gridItemSpan(*autoGridItem, autoPlacementMajorAxisDirection());
- ASSERT(majorAxisPositions.isTranslatedDefinite());
+ DCHECK(majorAxisPositions.isTranslatedDefinite());
DCHECK(!grid.gridItemSpan(*autoGridItem, autoPlacementMinorAxisDirection())
.isTranslatedDefinite());
size_t minorAxisSpanSize = GridPositionsResolver::spanSizeForAutoPlacedItem(
@@ -1098,10 +1098,10 @@ void LayoutGrid::layoutGridItems() {
const GridArea& area = m_grid.gridItemArea(*child);
#if DCHECK_IS_ON()
- DCHECK(area.columns.startLine() <
- m_trackSizingAlgorithm.tracks(ForColumns).size());
- DCHECK(area.rows.startLine() <
- m_trackSizingAlgorithm.tracks(ForRows).size());
+ DCHECK_LT(area.columns.startLine(),
+ m_trackSizingAlgorithm.tracks(ForColumns).size());
+ DCHECK_LT(area.rows.startLine(),
+ m_trackSizingAlgorithm.tracks(ForRows).size());
#endif
child->setLogicalLocation(findChildLogicalPosition(*child));
@@ -1123,7 +1123,7 @@ void LayoutGrid::layoutGridItems() {
}
void LayoutGrid::prepareChildForPositionedLayout(LayoutBox& child) {
- ASSERT(child.isOutOfFlowPositioned());
+ DCHECK(child.isOutOfFlowPositioned());
child.containingBlock()->insertPositionedObject(&child);
PaintLayer* childLayer = child.layer();
@@ -1172,7 +1172,7 @@ void LayoutGrid::offsetAndBreadthForPositionedChild(
GridTrackSizingDirection direction,
LayoutUnit& offset,
LayoutUnit& breadth) {
- ASSERT(!isOrthogonalChild(child));
+ DCHECK(!isOrthogonalChild(child));
bool isForColumns = direction == ForColumns;
GridSpan positions = GridPositionsResolver::resolveGridPositionsFromStyle(
@@ -1515,7 +1515,7 @@ bool LayoutGrid::hasAutoMarginsInRowAxis(const LayoutBox& child) const {
// moved to LayoutBox.
DISABLE_CFI_PERF
void LayoutGrid::updateAutoMarginsInRowAxisIfNeeded(LayoutBox& child) {
- ASSERT(!child.isOutOfFlowPositioned());
+ DCHECK(!child.isOutOfFlowPositioned());
LayoutUnit availableAlignmentSpace =
child.overrideContainingBlockContentLogicalWidth() -
@@ -1539,7 +1539,7 @@ void LayoutGrid::updateAutoMarginsInRowAxisIfNeeded(LayoutBox& child) {
// moved to LayoutBox.
DISABLE_CFI_PERF
void LayoutGrid::updateAutoMarginsInColumnAxisIfNeeded(LayoutBox& child) {
- ASSERT(!child.isOutOfFlowPositioned());
+ DCHECK(!child.isOutOfFlowPositioned());
LayoutUnit availableAlignmentSpace =
child.overrideContainingBlockContentLogicalHeight() -
@@ -2038,7 +2038,7 @@ ContentAlignmentData LayoutGrid::computeContentPositionAndDistributionOffset(
}
LayoutUnit LayoutGrid::translateRTLCoordinate(LayoutUnit coordinate) const {
- ASSERT(!styleRef().isLeftToRightDirection());
+ DCHECK(!styleRef().isLeftToRightDirection());
LayoutUnit alignmentOffset = m_columnPositions[0];
LayoutUnit rightGridEdgePosition =
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutGeometryMapStep.h ('k') | third_party/WebKit/Source/core/layout/LayoutIFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698