diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-10 16:50:44 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-10 16:50:44 +0000 |
| commit | f1b2cd0ebbdbcd4765f3d8a83ddeaccaa74c715b (patch) | |
| tree | 0e711e1f5d167a35844627206d709485a730b804 /ui/gfx/canvas_skia_linux.cc | |
| parent | 11edb87b32bc384c4df1ff342a38647c076a722f (diff) | |
| download | chromium_src-f1b2cd0ebbdbcd4765f3d8a83ddeaccaa74c715b.zip chromium_src-f1b2cd0ebbdbcd4765f3d8a83ddeaccaa74c715b.tar.gz chromium_src-f1b2cd0ebbdbcd4765f3d8a83ddeaccaa74c715b.tar.bz2 | |
Adding Wayland support for ui/gfx
* Added GL surface and context support for Wayland.
* Updated ui/gfx files to allow Wayland support
* All Wayland code is behind the use_wayland gyp flag
This CL depends on http://codereview.chromium.org/7457023
BUG=
TEST=Compiled Chrome with use_wayland disabled to verify that
the changes didn't break anything
Review URL: http://codereview.chromium.org/7467007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/canvas_skia_linux.cc')
| -rw-r--r-- | ui/gfx/canvas_skia_linux.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/gfx/canvas_skia_linux.cc b/ui/gfx/canvas_skia_linux.cc index 17da4fc..7cf72d5 100644 --- a/ui/gfx/canvas_skia_linux.cc +++ b/ui/gfx/canvas_skia_linux.cc @@ -45,17 +45,20 @@ void UpdateCairoFontOptions() { if (!cairo_font_options) cairo_font_options = cairo_font_options_create(); - GtkSettings* gtk_settings = gtk_settings_get_default(); gint antialias = 0; gint hinting = 0; gchar* hint_style = NULL; gchar* rgba_style = NULL; + +#if !defined(USE_WAYLAND) + GtkSettings* gtk_settings = gtk_settings_get_default(); 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 |