Refactor the PlatformContext layer to have only one class.

Previously we had three classes of PlatformCanvas*, one for each platform. Then
we had a typedef of PlatformContext to PlatformCanvas[Mac|Win|Linux] for the
specific platform.

This means that it was almost impossible to forward-declare PlatformCanvas and
there were a bunch of unnecessary includes of platform_canvas.h in header
files.

This change makes there be only one platform_canvas.h header with ifdefs, which
removes a decent amount of duplicated code. There is a platform-independent
file, and one platform-dependent file of platform_canvas for each platform.

I also renamed PlatformDevice[Mac|Win|Linux] to PlatformDevice, althouth in
this case I kept the separate headers since there was much less overlap.

I also broke out CanvasPaint into separate headers so this template doesn't
need to be included all over the project (only a couple of files actually need
it).

Review URL: http://codereview.chromium.org/125109

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18363 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 29 insertions, 9 deletions

diff --git a/app/gfx/canvas.h b/app/gfx/canvas.h
index e1d20b8..0fe258a 100644..100755
--- a/app/gfx/canvas.h
+++ b/app/gfx/canvas.h
@@ -208,10 +208,6 @@ class Canvas : public skia::PlatformCanvas {
   DISALLOW_COPY_AND_ASSIGN(Canvas);
 };
 
-#if defined(OS_WIN) || defined(OS_LINUX)
-typedef skia::CanvasPaintT<Canvas> CanvasPaint;
-#endif
-
 }  // namespace gfx;
 
 #endif  // #ifndef APP_GFX_CANVAS_H_
diff --git a/app/gfx/canvas_linux.cc b/app/gfx/canvas_linux.cc
index 3b363f8..6751115 100644..100755
--- a/app/gfx/canvas_linux.cc
+++ b/app/gfx/canvas_linux.cc
@@ -4,7 +4,9 @@
 
 #include "app/gfx/canvas.h"
 
+#include <cairo/cairo.h>
 #include <pango/pango.h>
+#include <pango/pangocairo.h>
 
 #include "app/gfx/font.h"
 #include "base/gfx/rect.h"
@@ -44,10 +46,10 @@ PangoFontDescription* PangoFontFromGfxFont(const gfx::Font& gfx_font) {
 namespace gfx {
 
 Canvas::Canvas(int width, int height, bool is_opaque)
-    : skia::PlatformCanvasLinux(width, height, is_opaque) {
+    : skia::PlatformCanvas(width, height, is_opaque) {
 }
 
-Canvas::Canvas() : skia::PlatformCanvasLinux() {
+Canvas::Canvas() : skia::PlatformCanvas() {
 }
 
 Canvas::~Canvas() {
@@ -58,7 +60,7 @@ void Canvas::SizeStringInt(const std::wstring& text,
                            const gfx::Font& font,
                            int* width, int* height, int flags) {
   cairo_surface_t* surface =
-    cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 0, 0);
+      cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 0, 0);
   cairo_t* cr = cairo_create(surface);
   PangoLayout* layout = pango_cairo_create_layout(cr);
 
diff --git a/app/gfx/canvas_paint.h b/app/gfx/canvas_paint.h
new file mode 100755
index 0000000..0b3c2a7
--- /dev/null
+++ b/app/gfx/canvas_paint.h
@@ -0,0 +1,22 @@
+// Copyright (c) 2009 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 APP_GFX_CANVAS_PAINT_H_

+#define APP_GFX_CANVAS_PAINT_H_

+

+#include "app/gfx/canvas.h"

+#include "skia/ext/canvas_paint.h"

+

+// Define a skia::CanvasPaint type that wraps our gfx::Canvas like the

+// skia::PlatformCanvasPaint wraps PlatformCanvas.

+

+namespace gfx {

+

+#if defined(OS_WIN) || defined(OS_LINUX)

+typedef skia::CanvasPaintT<Canvas> CanvasPaint;

+#endif

+

+}  // namespace gfx

+

+#endif  // APP_GFX_CANVAS_PAINT_H_

diff --git a/app/gfx/canvas_win.cc b/app/gfx/canvas_win.cc
index 2d818d4..9f70136 100644
--- a/app/gfx/canvas_win.cc
+++ b/app/gfx/canvas_win.cc
@@ -120,10 +120,10 @@ int ComputeFormatFlags(int flags, const std::wstring& text) {
 namespace gfx {
 
 Canvas::Canvas(int width, int height, bool is_opaque)
-    : skia::PlatformCanvasWin(width, height, is_opaque) {
+    : skia::PlatformCanvas(width, height, is_opaque) {
 }
 
-Canvas::Canvas() : skia::PlatformCanvasWin() {
+Canvas::Canvas() : skia::PlatformCanvas() {
 }
 
 Canvas::~Canvas() {