Update use of SkCanvas and SkDevice to match change in Skia

skia/ext/platform_canvas.h

 // 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.
 
 #ifndef SKIA_EXT_PLATFORM_CANVAS_H_
 #define SKIA_EXT_PLATFORM_CANVAS_H_
 #pragma once
 
 // The platform-specific device will include the necessary platform headers
 // to get the surface type.
 #include "skia/ext/platform_device.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 namespace skia {
 
 // This class is a specialization of the regular SkCanvas that is designed to
 // work with a PlatformDevice to manage platform-specific drawing. It allows
 // using both Skia operations and platform-specific operations.
 class PlatformCanvas : public SkCanvas {
  public:
+  // If you use the version with no arguments, you MUST call initialize()
+  PlatformCanvas();
+  explicit PlatformCanvas(SkDeviceFactory* factory);
   // Set is_opaque if you are going to erase the bitmap and not use
   // transparency: this will enable some optimizations.
-  // If you use the version with no arguments, you MUST call initialize()
-  PlatformCanvas();
   PlatformCanvas(int width, int height, bool is_opaque);
   virtual ~PlatformCanvas();
 
 #if defined(WIN32)
   // Windows ------------------------------------------------------------------
 
   // The shared_section parameter is passed to gfx::PlatformDevice::create.
   // See it for details.
   PlatformCanvas(int width, int height, bool is_opaque, HANDLE shared_section);
 
@@ skipping 54 matching lines @@
   // Return the stride (length of a line in bytes) for the given width. Because
   // we use 32-bits per pixel, this will be roughly 4*width. However, for
   // alignment reasons we may wish to increase that.
   static size_t StrideForWidth(unsigned width);
 
   // Allow callers to see the non-virtual function even though we have an
   // override of a virtual one.
   // FIXME(brettw) is this necessary?
   using SkCanvas::clipRect;
 
- protected:
-  // Creates a device store for use by the canvas. We override this so that
-  // the device is always our own so we know that we can use platform
-  // operations on it.
-  virtual SkDevice* createDevice(SkBitmap::Config,
-                                 int width,
-                                 int height,
-                                 bool is_opaque,
-                                 bool isForLayer);
-
  private:
   // Unimplemented. This is to try to prevent people from calling this function
   // on SkCanvas. SkCanvas' version is not virtual, so we can't prevent this
   // 100%, but hopefully this will make people notice and not use the function.
   // Calling SkCanvas' version will create a new device which is not compatible
   // with us and we will crash if somebody tries to draw into it with
   // CoreGraphics.
   virtual SkDevice* setBitmapDevice(const SkBitmap& bitmap);
 
   // Disallow copy and assign.
   PlatformCanvas(const PlatformCanvas&);
   PlatformCanvas& operator=(const PlatformCanvas&);
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_PLATFORM_CANVAS_H_