Rework gfx::Font by moving platform-specific code into inner classes....

gfx/canvas_skia_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 "gfx/canvas_skia.h"
 
 #include <cairo/cairo.h>
 #include <gtk/gtk.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
 
 #include "base/logging.h"
 #include "base/gtk_util.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/font.h"
 #include "gfx/gtk_util.h"
+#include "gfx/platform_font_gtk.h"
 #include "gfx/rect.h"
 
 namespace {
 
 const gunichar kAcceleratorChar = '&';
 
 // Font settings that we initialize once and then use when drawing text in
 // DrawStringInt().
 static cairo_font_options_t* cairo_font_options = NULL;
 
@@ skipping 115 matching lines @@
 
   // Set the resolution to match that used by Gtk. If we don't set the
   // resolution and the resolution differs from the default, Gtk and Chrome end
   // up drawing at different sizes.
   double resolution = gfx::GetPangoResolution();
   if (resolution > 0) {
     pango_cairo_context_set_resolution(pango_layout_get_context(layout),
                                        resolution);
   }
 
-  PangoFontDescription* desc = gfx::Font::PangoFontFromGfxFont(font);
+  PangoFontDescription* desc = font.GetNativeFont();
   pango_layout_set_font_description(layout, desc);
   pango_font_description_free(desc);
 
   // Set text and accelerator character if needed.
   std::string utf8 = WideToUTF8(text);
   if (flags & gfx::Canvas::SHOW_PREFIX) {
     // Escape the text string to be used as markup.
     gchar* escaped_text = g_markup_escape_text(utf8.c_str(), utf8.size());
     pango_layout_set_markup_with_accel(layout,
                                        escaped_text,
@@ skipping 76 matching lines @@
     // Cairo should draw from the top left corner already.
   } else if (flags & Canvas::TEXT_VALIGN_BOTTOM) {
     y += (h - height);
   } else {
     // Vertically centered.
     y += ((h - height) / 2);
   }
 
   cairo_move_to(cr, x, y);
   pango_cairo_show_layout(cr, layout);
-  if (font.style() & gfx::Font::UNDERLINED) {
+  if (font.GetStyle() & gfx::Font::UNDERLINED) {
+    gfx::PlatformFontGtk* platform_font =
+        static_cast<gfx::PlatformFontGtk*>(font.platform_font());
     double underline_y =
-        static_cast<double>(y) + height + font.underline_position();
-    cairo_set_line_width(cr, font.underline_thickness());
+        static_cast<double>(y) + height + platform_font->underline_position();
+    cairo_set_line_width(cr, platform_font->underline_thickness());
     cairo_move_to(cr, x, underline_y);
     cairo_line_to(cr, x + width, underline_y);
     cairo_stroke(cr);
   }
   cairo_restore(cr);
 
   g_object_unref(layout);
   // NOTE: beginPlatformPaint returned its surface, we shouldn't destroy it.
 }
 
 void CanvasSkia::DrawGdkPixbuf(GdkPixbuf* pixbuf, int x, int y) {
   if (!pixbuf) {
     NOTREACHED();
     return;
   }
 
   cairo_t* cr = beginPlatformPaint();
   gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
   cairo_paint(cr);
 }
 
 }  // namespace gfx