Allow assertions to be enabled in Blink Release builds.

Source/platform/Supplementable.h

 /*
  * Copyright (C) 2012 Google, Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 14 matching lines @@
 
 #ifndef Supplementable_h
 #define Supplementable_h
 
 #include "platform/heap/Handle.h"
 #include "wtf/Assertions.h"
 #include "wtf/HashMap.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
 #include "wtf/Threading.h"
 #endif
 
 namespace WebCore {
 
 // What you should know about Supplementable and Supplement
 // ========================================================
 // Supplementable and Supplement instances are meant to be thread local. They
 // should only be accessed from within the thread that created them. The
 // 2 classes are not designed for safe access from another thread. Violating
@@ skipping 71 matching lines @@
 
 template<>
 class SupplementTracing<false> {
 public:
     virtual ~SupplementTracing() { }
 };
 
 template<typename T, bool isGarbageCollected = false>
 class SupplementBase : public SupplementTracing<isGarbageCollected> {
 public:
-#if SECURITY_ASSERT_ENABLED
+#if ENABLE(SECURITY_ASSERT)
     virtual bool isRefCountedWrapper() const { return false; }
 #endif
 
     static void provideTo(SupplementableBase<T, isGarbageCollected>& host, const char* key, typename SupplementableTraits<T, isGarbageCollected>::SupplementArgumentType supplement)
     {
         host.provideSupplement(key, supplement);
     }
 
     static SupplementBase<T, isGarbageCollected>* from(SupplementableBase<T, isGarbageCollected>& host, const char* key)
     {
@@ skipping 38 matching lines @@
     }
 
     SupplementBase<T, isGarbageCollected>* requireSupplement(const char* key)
     {
         ASSERT(m_threadId == currentThread());
         return this->m_supplements.get(key);
     }
 
     void reattachThread()
     {
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
         m_threadId = currentThread();
 #endif
     }
 
     virtual void trace(Visitor* visitor) { visitor->trace(m_supplements); }
 
     void willBeDestroyed()
     {
         typedef typename SupplementableTraits<T, isGarbageCollected>::SupplementMap::iterator SupplementIterator;
         for (SupplementIterator it = m_supplements.begin(); it != m_supplements.end(); ++it)
             it->value->willBeDestroyed();
     }
 
     // FIXME: Oilpan: Make private and remove this ignore once PersistentHeapSupplementable is removed again.
 protected:
     GC_PLUGIN_IGNORE("")
     typename SupplementableTraits<T, isGarbageCollected>::SupplementMap m_supplements;
 
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
 protected:
     SupplementableBase() : m_threadId(currentThread()) { }
 
 private:
     ThreadIdentifier m_threadId;
 #endif
 };
 
 template<typename T>
 class HeapSupplement : public SupplementBase<T, true> { };
@@ skipping 36 matching lines @@
 };
 
 template<typename T>
 struct ThreadingTrait<WebCore::SupplementableBase<T, true> > {
     static const ThreadAffinity Affinity = ThreadingTrait<T>::Affinity;
 };
 
 } // namespace WebCore
 
 #endif // Supplementable_h