Reverting 7318.

skia/ext/platform_device_win.cc

 // Copyright (c) 2006-2008 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.
 
 #include "skia/ext/platform_device_win.h"
 
-#include "base/logging.h"
 #include "skia/ext/skia_utils_win.h"
 #include "SkMatrix.h"
 #include "SkPath.h"
 #include "SkRegion.h"
 #include "SkUtils.h"
 
 namespace skia {
 
 PlatformDeviceWin::PlatformDeviceWin(const SkBitmap& bitmap)
     : SkDevice(bitmap) {
 }
 
 // static
 void PlatformDeviceWin::InitializeDC(HDC context) {
   // Enables world transformation.
   // If the GM_ADVANCED graphics mode is set, GDI always draws arcs in the
   // counterclockwise direction in logical space. This is equivalent to the
   // statement that, in the GM_ADVANCED graphics mode, both arc control points
   // and arcs themselves fully respect the device context's world-to-device
   // transformation.
   BOOL res = SetGraphicsMode(context, GM_ADVANCED);
-  DCHECK_NE(res, 0);
+  SkASSERT(res != 0);
 
   // Enables dithering.
   res = SetStretchBltMode(context, HALFTONE);
-  DCHECK_NE(res, 0);
+  SkASSERT(res != 0);
   // As per SetStretchBltMode() documentation, SetBrushOrgEx() must be called
   // right after.
   res = SetBrushOrgEx(context, 0, 0, NULL);
-  DCHECK_NE(res, 0);
+  SkASSERT(res != 0);
 
   // Sets up default orientation.
   res = SetArcDirection(context, AD_CLOCKWISE);
-  DCHECK_NE(res, 0);
+  SkASSERT(res != 0);
 
   // Sets up default colors.
   res = SetBkColor(context, RGB(255, 255, 255));
-  DCHECK_NE(res, CLR_INVALID);
+  SkASSERT(res != CLR_INVALID);
   res = SetTextColor(context, RGB(0, 0, 0));
-  DCHECK_NE(res, CLR_INVALID);
+  SkASSERT(res != CLR_INVALID);
   res = SetDCBrushColor(context, RGB(255, 255, 255));
-  DCHECK_NE(res, CLR_INVALID);
+  SkASSERT(res != CLR_INVALID);
   res = SetDCPenColor(context, RGB(0, 0, 0));
-  DCHECK_NE(res, CLR_INVALID);
+  SkASSERT(res != CLR_INVALID);
 
   // Sets up default transparency.
   res = SetBkMode(context, OPAQUE);
-  DCHECK_NE(res, 0);
+  SkASSERT(res != 0);
   res = SetROP2(context, R2_COPYPEN);
-  DCHECK_NE(res, 0);
+  SkASSERT(res != 0);
 }
 
 // static
 void PlatformDeviceWin::LoadPathToDC(HDC context, const SkPath& path) {
   switch (path.getFillType()) {
     case SkPath::kWinding_FillType: {
       int res = SetPolyFillMode(context, WINDING);
-      DCHECK(res != 0);
+      SkASSERT(res != 0);
       break;
     }
     case SkPath::kEvenOdd_FillType: {
       int res = SetPolyFillMode(context, ALTERNATE);
-      DCHECK(res != 0);
+      SkASSERT(res != 0);
       break;
     }
     default: {
-      NOTREACHED();
+      SkASSERT(false);
       break;
     }
   }
   BOOL res = BeginPath(context);
-  DCHECK(res != 0);
+  SkASSERT(res != 0);
 
   CubicPaths paths;
   if (!SkPathToCubicPaths(&paths, path))
     return;
 
   std::vector<POINT> points;
   for (CubicPaths::const_iterator path(paths.begin()); path != paths.end();
        ++path) {
     if (!path->size())
       continue;
-    // DCHECK_EQ(points.size() % 4, 0);
     points.resize(0);
     points.reserve(path->size() * 3 / 4 + 1);
     points.push_back(SkPointToPOINT(path->front().p[0]));
     for (CubicPath::const_iterator point(path->begin()); point != path->end();
        ++point) {
       // Never add point->p[0]
       points.push_back(SkPointToPOINT(point->p[1]));
       points.push_back(SkPointToPOINT(point->p[2]));
       points.push_back(SkPointToPOINT(point->p[3]));
     }
-    DCHECK_EQ((points.size() - 1) % 3, 0);
+    SkASSERT((points.size() - 1) % 3 == 0);
     // This is slightly inefficient since all straight line and quadratic lines
     // are "upgraded" to a cubic line.
     // TODO(maruel):  http://b/1147346 We should use
     // PolyDraw/PolyBezier/Polyline whenever possible.
     res = PolyBezier(context, &points.front(),
                      static_cast<DWORD>(points.size()));
-    DCHECK_NE(res, 0);
+    SkASSERT(res != 0);
     if (res == 0)
       break;
   }
   if (res == 0) {
     // Make sure the path is discarded.
     AbortPath(context);
   } else {
     res = EndPath(context);
-    DCHECK(res != 0);
+    SkASSERT(res != 0);
   }
 }
 
 // static
 void PlatformDeviceWin::LoadTransformToDC(HDC dc, const SkMatrix& matrix) {
   XFORM xf;
   xf.eM11 = matrix[SkMatrix::kMScaleX];
   xf.eM21 = matrix[SkMatrix::kMSkewX];
   xf.eDx = matrix[SkMatrix::kMTransX];
   xf.eM12 = matrix[SkMatrix::kMSkewY];
@@ skipping 48 matching lines @@
         current_path = &paths->back();
         continue;
       }
       case SkPath::kDone_Verb:  // iter.next returns 0 points
       default: {
         current_path = NULL;
         // Will return false.
         break;
       }
     }
-    DCHECK(current_path);
+    SkASSERT(current_path);
     if (!current_path) {
       paths->clear();
       return false;
     }
     current_path->push_back(points_to_add);
   }
   return true;
 }
 
 // static
@@ skipping 16 matching lines @@
     // It is complex.
     SkPath path;
     region.getBoundaryPath(&path);
     // Clip. Note that windows clipping regions are not affected by the
     // transform so apply it manually.
     path.transform(transformation);
     LoadPathToDC(context, path);
     hrgn = PathToRegion(context);
   }
   int result = SelectClipRgn(context, hrgn);
-  DCHECK_NE(result, ERROR);
+  SkASSERT(result != ERROR);
   result = DeleteObject(hrgn);
-  DCHECK_NE(result, 0);
+  SkASSERT(result != 0);
 }
 
 }  // namespace skia