Canvas refactoring part 3....

gfx/canvas_skia.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 "gfx/canvas.h"
+#include "gfx/canvas_skia.h"
 
 #include <limits>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
-#include "gfx/canvas.h"
 #include "gfx/font.h"
 #include "gfx/rect.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 #if defined(OS_WIN)
 #include "gfx/canvas_skia_paint.h"
 #endif
 
 namespace gfx {
 
@@ skipping 245 matching lines @@
   const SkBitmap& device_bitmap = getDevice()->accessBitmap(false);
 
   // Make a bitmap to return, and a canvas to draw into it. We don't just want
   // to call extractSubset or the copy constuctor, since we want an actual copy
   // of the bitmap.
   SkBitmap result;
   device_bitmap.copyTo(&result, SkBitmap::kARGB_8888_Config);
   return result;
 }
 
+CanvasSkia* CanvasSkia::AsCanvasSkia() {
+  return this;
+}
+
+const CanvasSkia* CanvasSkia::AsCanvasSkia() const {
+  return this;
+}
+
 // static
 int CanvasSkia::DefaultCanvasTextAlignment() {
   if (!base::i18n::IsRTL())
     return gfx::Canvas::TEXT_ALIGN_LEFT;
   return gfx::Canvas::TEXT_ALIGN_RIGHT;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// Canvas2, public:
+// Canvas, public:
 
-Canvas2* Canvas2::CreateCanvas() {
-  return new Canvas;
+Canvas* Canvas::CreateCanvas() {
+  return new CanvasSkia;
 }
 
-Canvas2* Canvas2::CreateCanvas(int width, int height, bool is_opaque) {
-  return new Canvas(width, height, is_opaque);
+Canvas* Canvas::CreateCanvas(int width, int height, bool is_opaque) {
+  return new CanvasSkia(width, height, is_opaque);
 }
 
 #if defined(OS_WIN)
 // TODO(beng): move to canvas_win.cc, etc.
-class CanvasPaintWin : public CanvasSkiaPaint, public CanvasPaint2 {
+class CanvasPaintWin : public CanvasSkiaPaint, public CanvasPaint {
  public:
   CanvasPaintWin(gfx::NativeView view) : CanvasSkiaPaint(view) {}
 
   // Overridden from CanvasPaint2:
   virtual bool IsValid() const {
     return isEmpty();
   }
 
   virtual gfx::Rect GetInvalidRect() const {
     return gfx::Rect(paintStruct().rcPaint);
   }
 
-  virtual Canvas2* AsCanvas2() {
+  virtual Canvas* AsCanvas() {
     return this;
   }
 };
 #endif
 
-CanvasPaint2* CanvasPaint2::CreateCanvasPaint(gfx::NativeView view) {
+CanvasPaint* CanvasPaint::CreateCanvasPaint(gfx::NativeView view) {
 #if defined(OS_WIN)
   return new CanvasPaintWin(view);
 #else
   return NULL;
 #endif
 }
 
 }  // namespace gfx