Canvas refactoring part 2....

gfx/canvas_2.h

 // Copyright (c) 2010 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 GFX_CANVAS_2_H_
 #define GFX_CANVAS_2_H_
 
 #include <string>
 
 #include "gfx/native_widget_types.h"
 // TODO(beng): remove this include when we no longer depend on SkTypes.
 #include "skia/ext/platform_canvas.h"
 
 namespace gfx {
 
-class Canvas;
+class CanvasSkia;
 class Font;
 class Rect;
 
 // TODO(beng): documentation.
 class Canvas2 {
  public:
   // Specifies the alignment for text rendered with the DrawStringInt method.
   enum {
     TEXT_ALIGN_LEFT = 1,
     TEXT_ALIGN_CENTER = 2,
@@ skipping 141 matching lines @@
                             int h) = 0;
   virtual void TileImageInt(const SkBitmap& bitmap, int src_x, int src_y,
                             int dest_x, int dest_y, int w, int h) = 0;
 
   // Extracts a bitmap from the contents of this canvas.
   virtual SkBitmap ExtractBitmap() const = 0;
 
   // TODO(beng): remove this once we don't need to use any skia-specific methods
   //             through this interface.
   // A quick and dirty way to obtain the underlying SkCanvas.
-  virtual Canvas* AsCanvas() { return NULL; }
+  virtual CanvasSkia* AsCanvasSkia() { return NULL; }
 };
 
 class CanvasPaint2 {
  public:
   virtual ~CanvasPaint2() {}
 
   // Creates a canvas that paints to |view| when it is destroyed. The canvas is
   // sized to the client area of |view|.
   static CanvasPaint2* CreateCanvasPaint(gfx::NativeView view);
 
   // Returns true if the canvas has an invalid rect that needs to be repainted.
   virtual bool IsValid() const = 0;
 
   // Returns the rectangle that is invalid.
   virtual gfx::Rect GetInvalidRect() const = 0;
 
   // Returns the underlying Canvas2.
   virtual Canvas2* AsCanvas2() = 0;
 };
 
 }  // namespace gfx;
 
 #endif  // GFX_CANVAS_2_H_