Adding Wayland support for ui/gfx

ui/gfx/canvas_skia_linux.cc

Index: ui/gfx/canvas_skia_linux.cc
diff --git a/ui/gfx/canvas_skia_linux.cc b/ui/gfx/canvas_skia_linux.cc
index 9887d2aa8545c93ea896d09b6eae0dc34f903696..bd2f7d51a0a0775250b39d8b6130747623239f22 100644
--- a/ui/gfx/canvas_skia_linux.cc
+++ b/ui/gfx/canvas_skia_linux.cc
@@ -38,17 +38,21 @@ 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