Simplify platform_canvas.h by recognizing that PlatformCanvas does not actually extend

skia/ext/platform_canvas.cc

 // Copyright (c) 2011 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_canvas.h"
 
 #include "skia/ext/bitmap_platform_device.h"
 #include "third_party/skia/include/core/SkTypes.h"
 
 namespace skia {
 
-PlatformCanvas::PlatformCanvas() {}
-
-// static
-size_t PlatformCanvas::StrideForWidth(unsigned width) {
-  return 4 * width;
-}
-
-bool PlatformCanvas::initializeWithDevice(SkDevice* device) {
-  if (!device)
-    return false;
-
-  setDevice(device);
-  device->unref();  // Was created with refcount 1, and setDevice also refs.
-  return true;
-}
-
-SkCanvas* CreateBitmapCanvas(int width, int height, bool is_opaque) {
-  return new PlatformCanvas(width, height, is_opaque);
-}
-
-SkCanvas* TryCreateBitmapCanvas(int width, int height, bool is_opaque) {
-  PlatformCanvas* canvas = new PlatformCanvas();
-  if (!canvas->initialize(width, height, is_opaque)) {
-    delete canvas;
-    canvas = NULL;
-  }
-  return canvas;
-}
-
 SkDevice* GetTopDevice(const SkCanvas& canvas) {
   return canvas.getTopDevice(true);
 }
 
 bool SupportsPlatformPaint(const SkCanvas* canvas) {
   PlatformDevice* platform_device = GetPlatformDevice(GetTopDevice(*canvas));
   return platform_device && platform_device->SupportsPlatformPaint();
 }
 
 PlatformSurface BeginPlatformPaint(SkCanvas* canvas) {
@@ skipping 29 matching lines @@
   rect.setXYWH(SkIntToScalar(x), SkIntToScalar(y),
                SkIntToScalar(width), SkIntToScalar(height));
   SkPaint paint;
   // so we don't draw anything on a device that ignores xfermodes
   paint.setColor(0);
   // install our custom mode
   paint.setXfermode(new SkProcXfermode(MakeOpaqueXfermodeProc))->unref();
   canvas->drawRect(rect, paint);
 }
 
+size_t PlatformCanvasStrideForWidth(unsigned width) {
+  return 4 * width;
+}
+
+SkCanvas* CreateCanvas(SkDevice* device, OnFailureType failureType) {
+  if (!device) {
+    if (CRASH_ON_FAILURE == failureType)
+      SK_CRASH();
+    return NULL;
+  }
+  SkAutoUnref aur(device);
+  return new SkCanvas(device);
+}
+
 PlatformBitmap::PlatformBitmap() : surface_(0), platform_extra_(0) {}
 
 }  // namespace skia