ASSERT -> {DCHECK|DCHECK_XX}, ENABLE(ASSERT) -> DCHECK_IS_ON() in dom

third_party/WebKit/Source/core/dom/TreeShared.h

Index: third_party/WebKit/Source/core/dom/TreeShared.h
diff --git a/third_party/WebKit/Source/core/dom/TreeShared.h b/third_party/WebKit/Source/core/dom/TreeShared.h
index 50b8147d600c0d026932c18082fe2ba9f9a6b34f..087e4220ab376679637c99801c31501cf2f7a42c 100644
--- a/third_party/WebKit/Source/core/dom/TreeShared.h
+++ b/third_party/WebKit/Source/core/dom/TreeShared.h
@@ -39,43 +39,49 @@ protected:
         : m_refCount(1)
 #if ENABLE(SECURITY_ASSERT)
         , m_deletionHasBegun(false)
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
         , m_inRemovedLastRefFunction(false)
         , m_adoptionIsRequired(true)
 #endif
 #endif
     {
-        ASSERT(isMainThread());
+        DCHECK(isMainThread());
     }
 
     ~TreeShared()
     {
-        ASSERT(isMainThread());
-        ASSERT(!m_refCount);
+        DCHECK(isMainThread());
+        DCHECK(!m_refCount);
         ASSERT_WITH_SECURITY_IMPLICATION(m_deletionHasBegun);
-        ASSERT(!m_adoptionIsRequired);
+#if DCHECK_IS_ON()
+        DCHECK(!m_adoptionIsRequired);
+#endif
     }
 
 public:
     void ref()
     {
-        ASSERT(isMainThread());
+        DCHECK(isMainThread());
         ASSERT_WITH_SECURITY_IMPLICATION(!m_deletionHasBegun);
-        ASSERT(!m_inRemovedLastRefFunction);
-        ASSERT(!m_adoptionIsRequired);
+#if DCHECK_IS_ON()
+        DCHECK(!m_inRemovedLastRefFunction);
+        DCHECK(!m_adoptionIsRequired);
+#endif
         ++m_refCount;
     }
 
     void deref()
     {
-        ASSERT(isMainThread());
-        ASSERT(m_refCount > 0);
+        DCHECK(isMainThread());
+        DCHECK_GT(m_refCount, 0);
         ASSERT_WITH_SECURITY_IMPLICATION(!m_deletionHasBegun);
-        ASSERT(!m_inRemovedLastRefFunction);
-        ASSERT(!m_adoptionIsRequired);
+#if DCHECK_IS_ON()
+        DCHECK(!m_inRemovedLastRefFunction);
+        DCHECK(!m_adoptionIsRequired);
+#endif
         NodeType* thisNode = static_cast<NodeType*>(this);
         if (!--m_refCount && !thisNode->hasTreeSharedParent()) {
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
             m_inRemovedLastRefFunction = true;
 #endif
             thisNode->removedLastRef();
@@ -90,7 +96,7 @@ private:
 #if ENABLE(SECURITY_ASSERT)
 public:
     bool m_deletionHasBegun;
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
     bool m_inRemovedLastRefFunction;
 
 private:
@@ -107,8 +113,8 @@ template<typename NodeType> void adopted(TreeShared<NodeType>* object)
         return;
 
     ASSERT_WITH_SECURITY_IMPLICATION(!object->m_deletionHasBegun);
-#if ENABLE(ASSERT)
-    ASSERT(!object->m_inRemovedLastRefFunction);
+#if DCHECK_IS_ON()
+    DCHECK(!object->m_inRemovedLastRefFunction);
     object->m_adoptionIsRequired = false;
 #endif
 }