Changeset 29426 in webkit

Timestamp:

Jan 11, 2008 6:22:48 PM (16 years ago)

Author:

alp@webkit.org

Message:

2008-01-11 Sylvain Pasche <​sylvain.pasche@gmail.com>

Reviewed by Alp Toker.

[Gtk] Uneven glyph spacing with subpixel antialiasing
​http://bugs.webkit.org/show_bug.cgi?id=16715

Use cairo font options from the default GDK screen when creating a
scaled font.

• platform/graphics/gtk/FontPlatformDataGtk.cpp: (WebCore::FontPlatformData::FontPlatformData):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gtk/FontPlatformDataGtk.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-11  Sylvain Pasche  <sylvain.pasche@gmail.com>
+
+        Reviewed by Alp Toker.
+
+        [Gtk] Uneven glyph spacing with subpixel antialiasing
+        http://bugs.webkit.org/show_bug.cgi?id=16715
+
+        Use cairo font options from the default GDK screen when creating a
+        scaled font.
+
+        * platform/graphics/gtk/FontPlatformDataGtk.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+
 2008-01-11  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 

trunk/WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp

@@ -32 +32 @@
 #include <cairo.h>
 #include <fontconfig/fcfreetype.h>
+#include <gtk/gtk.h>
 
 namespace WebCore {
@@ -56 +57 @@
     FcPattern* pattern = FcPatternCreate();
     cairo_font_face_t* fontFace;
-    cairo_font_options_t* options;
+    static const cairo_font_options_t* defaultOptions = cairo_font_options_create();
+    const cairo_font_options_t* options;
     cairo_matrix_t fontMatrix;
 
@@ -99 +101 @@
     cairo_matrix_init_scale(&fontMatrix, m_fontDescription.computedSize(), m_fontDescription.computedSize());
     cairo_matrix_init_identity(&ctm);
-    options = cairo_font_options_create();
+
+#if GTK_CHECK_VERSION(2,10,0)
+    if (GdkScreen* screen = gdk_screen_get_default())
+        options = gdk_screen_get_font_options(screen);
+    else
+        options = defaultOptions;
+#else
+    options = defaultOptions;
+#endif
+
     m_scaledFont = cairo_scaled_font_create(fontFace, &fontMatrix, &ctm, options);
     cairo_font_face_destroy(fontFace);
-    cairo_font_options_destroy(options);
 
 freePattern: