third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp - Issue 2640163004: Replace ENABLE(ASSERT) with DCHECK_IS_ON().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2640163004: Replace ENABLE(ASSERT) with DCHECK_IS_ON(). (Closed)

Patch Set: Created 3 years, 11 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

« third_party/WebKit/Source/core/frame/LocalFrame.cpp ('K') | « third_party/WebKit/Source/core/layout/LayoutMedia.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTableCell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp

index 846637693e0a764d86073d4852f70f65918418f8..434e9574a9e3279ad0fb712ecad85e33c734c0e0 100644

--- a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp

@@ -139,7 +139,7 @@ static LayoutObject* nextInPreOrderAfterChildrenSkippingOutOfFlow(

}

if (!object)

return nullptr;

-#if ENABLE(ASSERT)

+#if DCHECK_IS_ON()

// Make sure that we didn't stumble into an inner multicol container.

for (LayoutObject* walker = object->parent(); walker && walker != flowThread;

walker = walker->parent())

@@ -188,7 +188,7 @@ static LayoutObject* previousInPreOrderSkippingOutOfFlow(

}