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

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

Issue 397733004: Allow assertions to be enabled in Blink Release builds. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased. Created 6 years, 5 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
« no previous file with comments | « Source/core/fileapi/File.h ('k') | Source/core/html/parser/BackgroundHTMLInputStream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index ee8f36b866f2731d1925f0acc8bc5f6ab202c92c..5dfe396c492c156d84ea8364dfced26f23cce545 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -991,7 +991,7 @@ void FrameView::layout(bool allowSubtree)
if (m_nestedLayoutCount)
return;
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
// Post-layout assert that nobody was re-marked as needing layout during layout.
document->renderView()->assertSubtreeIsLaidOut();
#endif
@@ -2736,7 +2736,7 @@ void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
RenderObject* renderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0;
RenderLayer* rootLayer = renderView->layer();
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
renderView->assertSubtreeIsLaidOut();
RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer->renderer());
#endif
@@ -2873,7 +2873,7 @@ void FrameView::updateLayoutAndStyleIfNeededRecursive()
// These asserts ensure that parent frames are clean, when child frames finished updating layout and style.
ASSERT(!needsLayout());
ASSERT(!m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate());
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
m_frame->document()->renderView()->assertRendererLaidOut();
#endif
« no previous file with comments | « Source/core/fileapi/File.h ('k') | Source/core/html/parser/BackgroundHTMLInputStream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698