Clean up some assertion code in WebKit.

third_party/WebKit/Source/platform/graphics/GraphicsContext.h

 /*
  * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008-2009 Torch Mobile, Inc.
  * Copyright (C) 2013 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.
@@ skipping 253 matching lines @@
         // center of the path aligned with the offset, so only half of the width is outside of the offset.
         return focusRingOffset(offset) + (focusRingWidth(width) + 1) / 2;
     }
 
 #if OS(MACOSX)
     static int focusRingWidth(int width) { return width; }
 #else
     static int focusRingWidth(int width) { return 1; }
 #endif
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
     void setInDrawingRecorder(bool);
 #endif
 
     static PassRefPtr<SkColorFilter> WebCoreColorFilterToSkiaColorFilter(ColorFilter);
 
 private:
     const GraphicsContextState* immutableState() const { return m_paintState; }
 
     GraphicsContextState* mutableState()
     {
@@ skipping 61 matching lines @@
     Vector<std::unique_ptr<GraphicsContextState>> m_paintStateStack;
     // Current index on the stack. May not be the last thing on the stack.
     unsigned m_paintStateIndex;
     // Raw pointer to the current state.
     GraphicsContextState* m_paintState;
 
     SkPictureRecorder m_pictureRecorder;
 
     SkMetaData m_metaData;
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
     unsigned m_layerCount;
     bool m_disableDestructionChecks;
     bool m_inDrawingRecorder;
 #endif
 
     const DisabledMode m_disabledState;
 
     float m_deviceScaleFactor;
 
     unsigned m_printing : 1;
     unsigned m_hasMetaData : 1;
 };
 
 } // namespace blink
 
 #endif // GraphicsContext_h