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

third_party/WebKit/Source/core/dom/CompositorProxy.cpp

Index: third_party/WebKit/Source/core/dom/CompositorProxy.cpp
diff --git a/third_party/WebKit/Source/core/dom/CompositorProxy.cpp b/third_party/WebKit/Source/core/dom/CompositorProxy.cpp
index 27b6564a4109d8bd6f4a235314699b326679796b..fd5ae040a01d31bbdd2c5275fa63c9f58ea9ad29 100644
--- a/third_party/WebKit/Source/core/dom/CompositorProxy.cpp
+++ b/third_party/WebKit/Source/core/dom/CompositorProxy.cpp
@@ -49,7 +49,7 @@ static bool isCallingCompositorFrameCallback()
 
 static void decrementCompositorProxiedPropertiesForElement(uint64_t elementId, uint32_t compositorMutableProperties)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     Node* node = DOMNodeIds::nodeForId(elementId);
     if (!node)
         return;
@@ -59,7 +59,7 @@ static void decrementCompositorProxiedPropertiesForElement(uint64_t elementId, u
 
 static void incrementCompositorProxiedPropertiesForElement(uint64_t elementId, uint32_t compositorMutableProperties)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     Node* node = DOMNodeIds::nodeForId(elementId);
     if (!node)
         return;
@@ -89,7 +89,7 @@ static uint32_t compositorMutablePropertiesFromNames(const Vector<String>& attri
     return properties;
 }
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
 static bool sanityCheckMutableProperties(uint32_t properties)
 {
     // Ensures that we only have bits set for valid mutable properties.
@@ -121,9 +121,11 @@ CompositorProxy::CompositorProxy(Element& element, const Vector<String>& attribu
     : m_elementId(DOMNodeIds::idForNode(&element))
     , m_compositorMutableProperties(compositorMutablePropertiesFromNames(attributeArray))
 {
-    ASSERT(isMainThread());
-    ASSERT(m_compositorMutableProperties);
-    ASSERT(sanityCheckMutableProperties(m_compositorMutableProperties));
+    DCHECK(isMainThread());
+    DCHECK(m_compositorMutableProperties);
+#if DCHECK_IS_ON()
+    DCHECK(sanityCheckMutableProperties(m_compositorMutableProperties));
+#endif
 
     incrementCompositorProxiedPropertiesForElement(m_elementId, m_compositorMutableProperties);
 }
@@ -132,8 +134,10 @@ CompositorProxy::CompositorProxy(uint64_t elementId, uint32_t compositorMutableP
     : m_elementId(elementId)
     , m_compositorMutableProperties(compositorMutableProperties)
 {
-    ASSERT(isControlThread());
-    ASSERT(sanityCheckMutableProperties(m_compositorMutableProperties));
+    DCHECK(isControlThread());
+#if DCHECK_IS_ON()
+    DCHECK(sanityCheckMutableProperties(m_compositorMutableProperties));
+#endif
     Platform::current()->mainThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&incrementCompositorProxiedPropertiesForElement, m_elementId, m_compositorMutableProperties));
 }