Adding Wayland support for ui/gfx

ui/gfx/canvas_skia_linux.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/canvas_skia.h"
 
 #include <cairo/cairo.h>
 #include <gtk/gtk.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
@@ skipping 20 matching lines @@
 
 // Font settings that we initialize once and then use when drawing text in
 // DrawStringInt().
 static cairo_font_options_t* cairo_font_options = NULL;
 
 // Update |cairo_font_options| based on GtkSettings, allocating it if needed.
 static void UpdateCairoFontOptions() {
   if (!cairo_font_options)
     cairo_font_options = cairo_font_options_create();
 
+#if !defined(USE_WAYLAND)
   GtkSettings* gtk_settings = gtk_settings_get_default();

[jonathan.backer, 2011/07/26 14:56:27]

move this down to where it's used and save an #if block

+#endif
   gint antialias = 0;
   gint hinting = 0;
   gchar* hint_style = NULL;
   gchar* rgba_style = NULL;
+#if !defined(USE_WAYLAND)
   g_object_get(gtk_settings,
                "gtk-xft-antialias", &antialias,
                "gtk-xft-hinting", &hinting,
                "gtk-xft-hintstyle", &hint_style,
                "gtk-xft-rgba", &rgba_style,
                NULL);
+#endif
 
   // g_object_get() doesn't tell us whether the properties were present or not,
   // but if they aren't (because gnome-settings-daemon isn't running), we'll get
   // NULL values for the strings.
   if (hint_style && rgba_style) {
     if (!antialias) {
       cairo_font_options_set_antialias(cairo_font_options,
                                        CAIRO_ANTIALIAS_NONE);
     } else if (strcmp(rgba_style, "none") == 0) {
       cairo_font_options_set_antialias(cairo_font_options,
@@ skipping 385 matching lines @@
   gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
   cairo_paint(cr);
 }
 
 ui::TextureID CanvasSkia::GetTextureID() {
   // TODO(wjmaclean)
   return 0;
 }
 
 }  // namespace gfx