| Index: third_party/WebKit/Source/core/frame/FrameView.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| index 44193576adf8f152a961b214c0ff318df901c561..e45cc82b8e7e64269130eb564621a12a41a5b950 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| @@ -1252,7 +1252,7 @@ void FrameView::layout() {
|
| if (m_nestedLayoutCount)
|
| return;
|
|
|
| -#if ENABLE(ASSERT)
|
| +#if DCHECK_IS_ON()
|
| // Post-layout assert that nobody was re-marked as needing layout during
|
| // layout.
|
| layoutView()->assertSubtreeIsLaidOut();
|
| @@ -1281,7 +1281,7 @@ void FrameView::invalidateTreeIfNeeded(
|
| invalidatePaintIfNeeded(paintInvalidationState);
|
| rootForPaintInvalidation.invalidateTreeIfNeeded(paintInvalidationState);
|
|
|
| -#if ENABLE(ASSERT)
|
| +#if DCHECK_IS_ON()
|
| layoutView()->assertSubtreeClearedPaintInvalidationFlags();
|
| #endif
|
|
|
| @@ -3106,7 +3106,7 @@ void FrameView::updateStyleAndLayoutIfNeededRecursiveInternal() {
|
| // These asserts ensure that parent frames are clean, when child frames
|
| // finished updating layout and style.
|
| checkDoesNotNeedLayout();
|
| -#if ENABLE(ASSERT)
|
| +#if DCHECK_IS_ON()
|
| m_frame->document()->layoutView()->assertLaidOut();
|
| #endif
|
|
|
|
|