Make ifdefs consistent in WebKit/Source/core/

third_party/WebKit/Source/platform/graphics/paint/DisplayItem.h

 // Copyright 2014 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.
 
 #ifndef DisplayItem_h
 #define DisplayItem_h
 
 #include "platform/PlatformExport.h"
 #include "platform/graphics/ContiguousContainer.h"
 #include "platform/graphics/paint/DisplayItemClient.h"
@@ skipping 318 matching lines @@
   static bool isCacheableType(Type type) {
     return isDrawingType(type) || type == kSubsequence;
   }
   bool isCacheable() const {
     return !skippedCache() && isCacheableType(m_type);
   }
 
   virtual bool isBegin() const { return false; }
   virtual bool isEnd() const { return false; }
 
-#if DCHECK_IS_ON()
+#ifdef NDEBUG
   virtual bool isEndAndPairedWith(DisplayItem::Type otherType) const {
     return false;
   }
 #endif
 
   virtual bool equals(const DisplayItem& other) const {
     return m_client == other.m_client && m_type == other.m_type &&
            m_derivedSize == other.m_derivedSize &&
            m_skippedCache == other.m_skippedCache;
   }
@@ skipping 61 matching lines @@
   bool isBegin() const final { return true; }
 };
 
 class PLATFORM_EXPORT PairedEndDisplayItem : public DisplayItem {
  protected:
   PairedEndDisplayItem(const DisplayItemClient& client,
                        Type type,
                        size_t derivedSize)
       : DisplayItem(client, type, derivedSize) {}
 
-#if ENABLE(ASSERT)
+#ifdef NDEBUG
   bool isEndAndPairedWith(DisplayItem::Type otherType) const override = 0;

[Alexander Alekseev, 2016/11/18 22:32:15]

This is declared in the base class only if NDEBUG

 #endif
 
  private:
   bool isEnd() const final { return true; }
 };
 
 }  // namespace blink
 
 #endif  // DisplayItem_h