Make ifdefs consistent in WebKit/Source/wtf/ .

third_party/WebKit/Source/wtf/StdLibExtras.h

 /*
  * Copyright (C) 2008 Apple 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 15 matching lines @@
 #ifndef WTF_StdLibExtras_h
 #define WTF_StdLibExtras_h
 
 #include "base/numerics/safe_conversions.h"
 #include "wtf/Assertions.h"
 #include "wtf/CPU.h"
 #include "wtf/LeakAnnotations.h"
 #include "wtf/TypeTraits.h"
 #include <cstddef>
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
 #include "wtf/Noncopyable.h"
 #include "wtf/Threading.h"
 
 class WTF_EXPORT StaticLocalVerifier {
   WTF_MAKE_NONCOPYABLE(StaticLocalVerifier);
 
  public:
   StaticLocalVerifier()
       : m_safelyInitialized(WTF::isBeforeThreadCreated()),
         m_thread(WTF::currentThread()) {}
 
   bool isNotRacy() {
     // Make sure that this 1) is safely initialized, 2) keeps being called
     // on the same thread, or 3) is called within
     // AtomicallyInitializedStatic (i.e. with a lock held).
-    return m_safelyInitialized || m_thread == WTF::currentThread() ||
-           WTF::isAtomicallyInitializedStaticMutexLockHeld();
+    return m_safelyInitialized || m_thread == WTF::currentThread()
+#if DCHECK_IS_ON()

[Yuta Kitamura, 2016/12/06 09:22:02]

We are already within DCHECK_IS_ON block. Why do you need another?

[Alexander Alekseev, 2016/12/06 09:51:02]

Sorry, I first updated this block and then the outer one.

Fixed.

+           || WTF::isAtomicallyInitializedStaticMutexLockHeld();
+#else
+           /* Presubmit check prohibits bare ';'.*/
+           || false;
+#endif
   }
 
  private:
   bool m_safelyInitialized;
   ThreadIdentifier m_thread;
 };
 #endif
 
 namespace blink {
 template <typename T>
@@ skipping 19 matching lines @@
     ASSERT(singleton);
     // If this assert triggers, you're supplying an empty ("()") 'Arguments'
     // argument to DEFINE_STATIC_LOCAL() - it must be the heap object you wish
     // to create as a static singleton and wrapped up with a Persistent
     // reference.
     ASSERT(*singleton);
     return **singleton;
   }
 };
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
 #define DEFINE_STATIC_LOCAL_CHECK_THREADSAFE_ACCESS(Name) \
   static StaticLocalVerifier Name##StaticLocalVerifier;   \
   ASSERT(Name##StaticLocalVerifier.isNotRacy())
 #else
 #define DEFINE_STATIC_LOCAL_CHECK_THREADSAFE_ACCESS(Name)
 #endif
 
 // Use DEFINE_STATIC_LOCAL() to declare and define a static local variable
 // (static T;) so that it is leaked and its destructors are not called at exit.
 // T may also be a Blink garbage collected object, in which case it is
@@ skipping 134 matching lines @@
 enum NotNullTag { NotNull };
 inline void* operator new(size_t, NotNullTag, void* location) {
   ASSERT(location);
   return location;
 }
 
 using WTF::bitwiseCast;
 using WTF::safeCast;
 
 #endif  // WTF_StdLibExtras_h