Changeset 30201 in webkit

Timestamp:

Feb 13, 2008 8:29:00 AM (16 years ago)

Author:

alp@webkit.org

Message:

2008-02-13 Alp Toker <​alp@atoker.com>

Reviewed by Adam Roben.

Fix very small, upside down, inside out text on GTK+/DirectFB.

Based on an initial patch by Sriram Neelakandan <​sriram.neelakandan@gmail.com>

Test the result of gdk_screen_get_resolution() and use a default
fallback in case of failure.

Also remove an unhelpful runtime warning.

• webkit/webkitwebview.cpp:

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• webkit/webkitwebview.cpp (modified) (2 diffs)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2008-02-13  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Adam Roben.
+
+        Fix very small, upside down, inside out text on GTK+/DirectFB.
+
+        Based on an initial patch by Sriram Neelakandan <sriram.neelakandan@gmail.com>
+
+        Test the result of gdk_screen_get_resolution() and use a default
+        fallback in case of failure.
+
+        Also remove an unhelpful runtime warning.
+
+        * webkit/webkitwebview.cpp:
+
 2008-02-08  Pierre-Luc Beaudoin  <pierre-luc.beaudoin@collabora.co.uk>
 

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -57 +57 @@
 #include <gdk/gdkkeysyms.h>
 
+static const double defaultDPI = 96.0;
+
 using namespace WebKit;
 using namespace WebCore;
@@ -1095 +1097 @@
                  NULL);
 
-#if GTK_CHECK_VERSION(2, 10, 0)
+    gdouble DPI = defaultDPI;
+#if GTK_CHECK_VERSION(2,10,0)
     GdkScreen* screen = gtk_widget_has_screen(GTK_WIDGET(webView)) ? gtk_widget_get_screen(GTK_WIDGET(webView)) : gdk_screen_get_default();
-    gdouble DPI = gdk_screen_get_resolution(screen);
-#else
-    gdouble DPI = 96;
-    g_warning("Cannot retrieve resolution, falling back to 96 DPI");
+    if (screen) {
+        DPI = gdk_screen_get_resolution(screen);
+        // gdk_screen_get_resolution() returns -1 when no DPI is set.
+        if (DPI == -1)
+            DPI = defaultDPI;
+    }
 #endif
+    ASSERT(DPI > 0);
     settings->setDefaultFontSize(defaultFontSize / 72.0 * DPI);
     settings->setDefaultFixedFontSize(defaultMonospaceFontSize / 72.0 * DPI);