Refactor the PlatformContext layer to have only one class.

app/gfx/canvas_linux.cc

 // 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.
 
 #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"
 #include "base/logging.h"
 #include "base/string_util.h"
 
 namespace {
 
 // Returns a new pango font, free with pango_font_description_free().
 PangoFontDescription* PangoFontFromGfxFont(const gfx::Font& gfx_font) {
@@ skipping 19 matching lines @@
   }
 
   return pfd;
 }
 
 }  // namespace
 
 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() {
 }
 
 // static
 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);
 
   if (flags & NO_ELLIPSIS) {
     pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
   } else {
     pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
   }
 
   if (flags & TEXT_ALIGN_CENTER) {
@@ skipping 92 matching lines @@
 
   cairo_move_to(cr, x, y);
   pango_cairo_show_layout(cr, layout);
 
   g_object_unref(layout);
   cairo_destroy(cr);
   // NOTE: beginPlatformPaint returned its surface, we shouldn't destroy it.
 }
 
 }  // namespace gfx