Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/gtk_util.cc

Issue 7467007: Adding Wayland support for ui/gfx (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Accidentally pulled in some extra changes in common.gypi Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ui/gfx/gl/gl_surface_egl.cc ('K') | « ui/gfx/gl/gl_surface_wayland.cc ('k') | ui/gfx/native_widget_types.h » ('j') | ui/gfx/platform_font_gtk.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gtk_util.cc
diff --git a/ui/gfx/gtk_util.cc b/ui/gfx/gtk_util.cc
index b1c7f44ace9e418aa4a9b3017ff35d16b4d43077..10b5bf0ea8c9c477f0c5a4bb3eda6b3452f0bb10 100644
--- a/ui/gfx/gtk_util.cc
+++ b/ui/gfx/gtk_util.cc
@@ -169,7 +169,12 @@ double GetPangoResolution() {
static bool determined_resolution = false;
if (!determined_resolution) {
determined_resolution = true;
+#if defined(USE_WAYLAND)
+ PangoFontMap* font_map = pango_cairo_font_map_get_default();
+ PangoContext* default_context = pango_font_map_create_context(font_map);
+#else
PangoContext* default_context = gdk_pango_context_get();
+#endif
resolution = pango_cairo_context_get_resolution(default_context);
g_object_unref(default_context);
}
« ui/gfx/gl/gl_surface_egl.cc ('K') | « ui/gfx/gl/gl_surface_wayland.cc ('k') | ui/gfx/native_widget_types.h » ('j') | ui/gfx/platform_font_gtk.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698