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

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2556723002: Make ifdefs consistent in WebKit/Source/core/frame/. (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698