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

Unified Diff: Source/core/rendering/RenderObject.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/rendering/RenderObject.h ('k') | Source/core/rendering/RenderTableCell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderObject.cpp
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
index 07ce0f58a94db8fcc68b546c972408c0021e503f..9e72e470370fa9960797db03a40b95aec44e7459 100644
--- a/Source/core/rendering/RenderObject.cpp
+++ b/Source/core/rendering/RenderObject.cpp
@@ -101,7 +101,7 @@ static bool gModifyRenderTreeStructureAnyState = false;
using namespace HTMLNames;
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
RenderObject::SetLayoutNeededForbiddenScope::SetLayoutNeededForbiddenScope(RenderObject& renderObject)
: m_renderObject(renderObject)
@@ -119,7 +119,7 @@ RenderObject::SetLayoutNeededForbiddenScope::~SetLayoutNeededForbiddenScope()
struct SameSizeAsRenderObject {
virtual ~SameSizeAsRenderObject() { } // Allocate vtable pointer.
void* pointers[5];
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
unsigned m_debugBitfields : 2;
#endif
unsigned m_bitfields;
@@ -216,7 +216,7 @@ RenderObject::RenderObject(Node* node)
, m_parent(0)
, m_previous(0)
, m_next(0)
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
, m_hasAXObject(false)
, m_setNeedsLayoutForbidden(false)
#endif
@@ -230,8 +230,8 @@ RenderObject::RenderObject(Node* node)
RenderObject::~RenderObject()
{
ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->removeRenderObject(this);
-#ifndef NDEBUG
ASSERT(!m_hasAXObject);
+#ifndef NDEBUG
renderObjectCounter.decrement();
#endif
}
@@ -717,7 +717,7 @@ void RenderObject::markContainingBlocksForLayout(bool scheduleRelayout, RenderOb
last->scheduleRelayout();
}
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
void RenderObject::checkBlockPositionedObjectsNeedLayout()
{
ASSERT(!needsLayout());
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RenderTableCell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698