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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutFlowThread.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/LayoutFlowThread.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutFlowThread.cpp b/third_party/WebKit/Source/core/layout/LayoutFlowThread.cpp
index 237bacac61753464c90959f7a1c38ec97f50d2aa..3cf3e0b6e73db13f8d4d7ff6c2e658fc0efb9169 100644
--- a/third_party/WebKit/Source/core/layout/LayoutFlowThread.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutFlowThread.cpp
@@ -42,7 +42,7 @@ LayoutFlowThread::LayoutFlowThread()
LayoutFlowThread* LayoutFlowThread::locateFlowThreadContainingBlockOf(
const LayoutObject& descendant,
AncestorSearchConstraint constraint) {
- ASSERT(descendant.isInsideFlowThread());
+ DCHECK(descendant.isInsideFlowThread());
LayoutObject* curr = const_cast<LayoutObject*>(&descendant);
while (curr) {
if (curr->isSVGChild())
@@ -76,7 +76,7 @@ LayoutFlowThread* LayoutFlowThread::locateFlowThreadContainingBlockOf(
void LayoutFlowThread::removeColumnSetFromThread(
LayoutMultiColumnSet* columnSet) {
- ASSERT(columnSet);
+ DCHECK(columnSet);
m_multiColumnSetList.erase(columnSet);
invalidateColumnSets();
// Clear the interval tree right away, instead of leaving it around with dead
@@ -100,7 +100,7 @@ bool LayoutFlowThread::mapToVisualRectInAncestorSpaceInternal(
TransformState& transformState,
VisualRectFlags visualRectFlags) const {
// A flow thread should never be an invalidation container.
- DCHECK(ancestor != this);
+ DCHECK_NE(ancestor, this);
transformState.flatten();
LayoutRect rect(transformState.lastPlanarQuad().boundingBox());
rect = fragmentsBoundingBox(rect);
@@ -212,7 +212,7 @@ LayoutUnit LayoutFlowThread::nextLogicalTopForUnbreakableContent(
LayoutRect LayoutFlowThread::fragmentsBoundingBox(
const LayoutRect& layerBoundingBox) const {
- ASSERT(!RuntimeEnabledFeatures::slimmingPaintV2Enabled() ||
+ DCHECK(!RuntimeEnabledFeatures::slimmingPaintV2Enabled() ||
!m_columnSetsInvalidated);
LayoutRect result;

Powered by Google App Engine
This is Rietveld 408576698