Clean up some assertion code in WebKit.

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

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 40 matching lines @@
 #include "wtf/MathExtras.h"
 #include <memory>
 
 namespace blink {
 
 GraphicsContext::GraphicsContext(PaintController& paintController, DisabledMode disableContextOrPainting, SkMetaData* metaData)
     : m_canvas(nullptr)
     , m_paintController(paintController)
     , m_paintStateStack()
     , m_paintStateIndex(0)
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
     , m_layerCount(0)
     , m_disableDestructionChecks(false)
     , m_inDrawingRecorder(false)
 #endif
     , m_disabledState(disableContextOrPainting)
     , m_deviceScaleFactor(1.0f)
     , m_printing(false)
     , m_hasMetaData(!!metaData)
 {
     if (metaData)
         m_metaData = *metaData;
 
     // FIXME: Do some tests to determine how many states are typically used, and allocate
     // several here.
     m_paintStateStack.append(GraphicsContextState::create());
     m_paintState = m_paintStateStack.last().get();
 
     if (contextDisabled()) {
         DEFINE_STATIC_REF(SkCanvas, nullCanvas, (adoptRef(SkCreateNullCanvas())));
         m_canvas = nullCanvas;
     }
 }
 
 GraphicsContext::~GraphicsContext()
 {
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
     if (!m_disableDestructionChecks) {
         ASSERT(!m_paintStateIndex);
         ASSERT(!m_paintState->saveCount());
         ASSERT(!m_layerCount);
         ASSERT(!saveCount());
     }
 #endif
 }
 
 void GraphicsContext::save()
@@ skipping 55 matching lines @@
 void GraphicsContext::restoreLayer()
 {
     if (contextDisabled())
         return;
 
     ASSERT(m_canvas);
 
     m_canvas->restore();
 }
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
 void GraphicsContext::setInDrawingRecorder(bool val)
 {
     // Nested drawing recorers are not allowed.
     ASSERT(!val || !m_inDrawingRecorder);
     m_inDrawingRecorder = val;
 }
 #endif
 
 void GraphicsContext::setShadow(const FloatSize& offset, float blur, const Color& color,
     DrawLooperBuilder::ShadowTransformMode shadowTransformMode,
@@ skipping 65 matching lines @@
     layerPaint.setColorFilter(toSkSp(WebCoreColorFilterToSkiaColorFilter(colorFilter)));
     layerPaint.setImageFilter(std::move(imageFilter));
 
     if (bounds) {
         SkRect skBounds = *bounds;
         saveLayer(&skBounds, &layerPaint);
     } else {
         saveLayer(nullptr, &layerPaint);
     }
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
     ++m_layerCount;
 #endif
 }
 
 void GraphicsContext::endLayer()
 {
     if (contextDisabled())
         return;
 
     restoreLayer();
@@ skipping 1071 matching lines @@
     static const SkPMColor colors[] = {
         SkPreMultiplyARGB(0x60, 0xFF, 0x00, 0x00), // More transparent red
         SkPreMultiplyARGB(0x60, 0xC0, 0xC0, 0xC0)  // More transparent gray
     };
 
     return colors[index];
 }
 #endif
 
 } // namespace blink