Reverting 7318.

skia/ext/vector_canvas.cc

Index: skia/ext/vector_canvas.cc
===================================================================
--- skia/ext/vector_canvas.cc	(revision 7318)
+++ skia/ext/vector_canvas.cc	(working copy)
@@ -4,7 +4,6 @@
 
 #include "skia/ext/vector_canvas.h"
 
-#include "base/logging.h"
 #include "skia/ext/vector_device.h"
 
 namespace skia {
@@ -14,7 +13,8 @@
 
 VectorCanvas::VectorCanvas(HDC dc, int width, int height) {
   bool initialized = initialize(dc, width, height);
-  CHECK(initialized);
+  if (!initialized)
+    __debugbreak();
 }
 
 VectorCanvas::~VectorCanvas() {
@@ -35,20 +35,20 @@
     return PlatformCanvasWin::setBounder(bounder);
 
   // This function isn't used in the code. Verify this assumption.
-  NOTREACHED();
+  SkASSERT(false);
   return NULL;
 }
 
 SkDevice* VectorCanvas::createDevice(SkBitmap::Config config,
                                      int width, int height,
                                      bool is_opaque, bool isForLayer) {
-  DCHECK(config == SkBitmap::kARGB_8888_Config);
+  SkASSERT(config == SkBitmap::kARGB_8888_Config);
   return createPlatformDevice(width, height, is_opaque, NULL);
 }
 
 SkDrawFilter* VectorCanvas::setDrawFilter(SkDrawFilter* filter) {
   // This function isn't used in the code. Verify this assumption.
-  NOTREACHED();
+  SkASSERT(false);
   return NULL;
 }
 
@@ -76,7 +76,7 @@
   // multiply each SkScalar that are passed to SkScalarRound(value) as
   // SkScalarRound(value * 10). Safari is already doing the same for text
   // rendering.
-  DCHECK(shared_section);
+  SkASSERT(shared_section);
   PlatformDeviceWin* device = VectorDevice::create(
       reinterpret_cast<HDC>(shared_section), width, height);
   return device;