Canvas refactoring part 3....

gfx/canvas_skia.h

Index: gfx/canvas_skia.h
===================================================================
--- gfx/canvas_skia.h	(revision 50664)
+++ gfx/canvas_skia.h	(working copy)
@@ -6,7 +6,7 @@
 #define GFX_CANVAS_SKIA_H_
 
 #include "base/basictypes.h"
-#include "gfx/canvas_2.h"
+#include "gfx/canvas.h"
 #include "skia/ext/platform_canvas.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
@@ -33,7 +33,7 @@
 // the variant that does not take a SkXfermode::Mode uses a transfer mode
 // of kSrcOver_Mode.
 class CanvasSkia : public skia::PlatformCanvas,
-                   public Canvas2 {
+                   public Canvas {
  public:
   // Creates an empty Canvas. Callers must use initialize before using the
   // canvas.
@@ -116,6 +116,8 @@
   virtual void TileImageInt(const SkBitmap& bitmap, int src_x, int src_y,
                             int dest_x, int dest_y, int w, int h);
   virtual SkBitmap ExtractBitmap() const;
+  virtual CanvasSkia* AsCanvasSkia();
+  virtual const CanvasSkia* AsCanvasSkia() const;
 
  private:
 #if defined(OS_WIN)