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

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/dom/CompositorProxy.h"
 
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/DOMNodeIds.h"
 #include "core/dom/ExceptionCode.h"
@@ skipping 31 matching lines @@
 }
 
 static bool isCallingCompositorFrameCallback()
 {
     // TODO(sad): Check that the requestCompositorFrame callbacks are currently being called.
     return true;
 }
 
 static void decrementCompositorProxiedPropertiesForElement(uint64_t elementId, uint32_t compositorMutableProperties)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     Node* node = DOMNodeIds::nodeForId(elementId);
     if (!node)
         return;
     Element* element = toElement(node);
     element->decrementCompositorProxiedProperties(compositorMutableProperties);
 }
 
 static void incrementCompositorProxiedPropertiesForElement(uint64_t elementId, uint32_t compositorMutableProperties)
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     Node* node = DOMNodeIds::nodeForId(elementId);
     if (!node)
         return;
     Element* element = toElement(node);
     element->incrementCompositorProxiedProperties(compositorMutableProperties);
 }
 
 static bool raiseExceptionIfMutationNotAllowed(ExceptionState& exceptionState)
 {
     if (!isControlThread()) {
         exceptionState.throwDOMException(NoModificationAllowedError, "Cannot mutate a proxy attribute from the main page.");
         return true;
     }
     if (!isCallingCompositorFrameCallback()) {
         exceptionState.throwDOMException(NoModificationAllowedError, "Cannot mutate a proxy attribute outside of a requestCompositorFrame callback.");
         return true;
     }
     return false;
 }
 
 static uint32_t compositorMutablePropertiesFromNames(const Vector<String>& attributeArray)
 {
     uint32_t properties = 0;
     for (const auto& attribute : attributeArray) {
         properties |= compositorMutablePropertyForName(attribute);
     }
     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.
     uint32_t sanityCheckProperties = properties;
     for (unsigned i = 0; i < WTF_ARRAY_LENGTH(allowedProperties); ++i) {
         sanityCheckProperties &= ~static_cast<uint32_t>(allowedProperties[i].property);
     }
     return !sanityCheckProperties;
 }
 #endif
@@ skipping 11 matching lines @@
 
 CompositorProxy* CompositorProxy::create(uint64_t elementId, uint32_t compositorMutableProperties)
 {
     return new CompositorProxy(elementId, compositorMutableProperties);
 }
 
 CompositorProxy::CompositorProxy(Element& element, const Vector<String>& attributeArray)
     : 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);
 }
 
 CompositorProxy::CompositorProxy(uint64_t elementId, uint32_t compositorMutableProperties)
     : 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));
 }
 
 CompositorProxy::~CompositorProxy()
 {
     if (m_connected)
         disconnect();
 }
 
 bool CompositorProxy::supports(const String& attributeName) const
@@ skipping 89 matching lines @@
 void CompositorProxy::disconnect()
 {
     m_connected = false;
     if (isMainThread())
         decrementCompositorProxiedPropertiesForElement(m_elementId, m_compositorMutableProperties);
     else
         Platform::current()->mainThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&decrementCompositorProxiedPropertiesForElement, m_elementId, m_compositorMutableProperties));
 }
 
 } // namespace blink