Adding Wayland support for ui/gfx

ui/gfx/platform_font_gtk.cc

 // Copyright (c) 2011 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 "ui/gfx/platform_font_gtk.h"
 
 #include <algorithm>
 #include <fontconfig/fontconfig.h>
+#if !defined(USE_WAYLAND)

[sky, 2011/07/27 15:51:05]

conditionals after non-conditionals.

 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
+#endif
 #include <map>
 #include <pango/pango.h>
 
 #include "base/logging.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
+#include "pango/pangocairo.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/gtk_util.h"
 
 namespace {
 
 // The font family name which is used when a user's application font for
 // GNOME/KDE is a non-scalable one. The name should be listed in the
@@ skipping 22 matching lines @@
 }
 
 // Retrieves the pango metrics for a pango font description. Caches the metrics
 // and never frees them. The metrics objects are relatively small and
 // very expensive to look up.
 PangoFontMetrics* GetPangoFontMetrics(PangoFontDescription* desc) {
   static std::map<int, PangoFontMetrics*>* desc_to_metrics = NULL;
   static PangoContext* context = NULL;
 
   if (!context) {
+#if defined(USE_WAYLAND)
+    PangoFontMap *font_map = pango_cairo_font_map_get_default();

[sky, 2011/07/27 15:51:05]

This looks to be the same as in gtk_util. Create a function in gtk_util that
both places use and has the ifdef.

+    context = pango_font_map_create_context(font_map);
+#else
     context = gdk_pango_context_get_for_screen(gdk_screen_get_default());
+#endif
     pango_context_set_language(context, pango_language_get_default());
   }
 
   if (!desc_to_metrics) {
     desc_to_metrics = new std::map<int, PangoFontMetrics*>();
   }
 
   int desc_hash = pango_font_description_hash(desc);
   std::map<int, PangoFontMetrics*>::iterator i =
       desc_to_metrics->find(desc_hash);
@@ skipping 43 matching lines @@
 
 namespace gfx {
 
 Font* PlatformFontGtk::default_font_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformFontGtk, public:
 
 PlatformFontGtk::PlatformFontGtk() {
   if (default_font_ == NULL) {
+#if defined(USE_WAYLAND)

[sky, 2011/07/27 15:51:05]

This code is a bit hard to read. Create a function that returns the name, as a
std::string, so you don't need the free around 150.

+    char font_name[] = "sans 10";
+#else
     GtkSettings* settings = gtk_settings_get_default();
 
     gchar* font_name = NULL;
     g_object_get(settings, "gtk-font-name", &font_name, NULL);
 
     // Temporary CHECK for helping track down
     // http://code.google.com/p/chromium/issues/detail?id=12530
     CHECK(font_name) << " Unable to get gtk-font-name for default font.";
+#endif
 
     PangoFontDescription* desc =
         pango_font_description_from_string(font_name);
     default_font_ = new Font(desc);
     pango_font_description_free(desc);
+
+#if !defined(USE_WAYLAND)
     g_free(font_name);
+#endif
 
     DCHECK(default_font_);
   }
 
   InitFromPlatformFont(
       static_cast<PlatformFontGtk*>(default_font_->platform_font()));
 }
 
 PlatformFontGtk::PlatformFontGtk(const Font& other) {
   InitFromPlatformFont(
@@ skipping 300 matching lines @@
   return new PlatformFontGtk(native_font);
 }
 
 // static
 PlatformFont* PlatformFont::CreateFromNameAndSize(const string16& font_name,
                                                   int font_size) {
   return new PlatformFontGtk(font_name, font_size);
 }
 
 }  // namespace gfx