Changeset 224776 in webkit

Timestamp:

Nov 13, 2017 1:42:54 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Automatically adjust font size when gtk-xft-dpi changes
​https://bugs.webkit.org/show_bug.cgi?id=142673

Patch by Gabriel Ivascu <​givascu@igalia.com> on 2017-11-13
Reviewed by Michael Catanzaro.

Source/WebCore:

• platform/PlatformScreen.h:
• platform/gtk/PlatformScreenGtk.cpp:

(WebCore::gtkXftDPIChangedCallback):
(WebCore::setScreenDPIObserverHandler):

• platform/wpe/PlatformScreenWPE.cpp:

(WebCore::setScreenDPIObserverHandler):

Source/WebKit:

• UIProcess/API/glib/WebKitSettings.cpp:

(webKitSettingsDispose):
(webKitSettingsConstructed):
(webkit_settings_class_init):

Tools:

• TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:

(testWebKitSettings):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/PlatformScreen.h (modified) (2 diffs)
• Source/WebCore/platform/gtk/PlatformScreenGtk.cpp (modified) (2 diffs)
• Source/WebCore/platform/wpe/PlatformScreenWPE.cpp (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-13  Gabriel Ivascu  <givascu@igalia.com>
+
+        [GTK] Automatically adjust font size when gtk-xft-dpi changes
+        https://bugs.webkit.org/show_bug.cgi?id=142673
+
+        Reviewed by Michael Catanzaro.
+
+        * platform/PlatformScreen.h:
+        * platform/gtk/PlatformScreenGtk.cpp:
+        (WebCore::gtkXftDPIChangedCallback):
+        (WebCore::setScreenDPIObserverHandler):
+        * platform/wpe/PlatformScreenWPE.cpp:
+        (WebCore::setScreenDPIObserverHandler):
+
 2017-11-13  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/platform/PlatformScreen.h

@@ -25 +25 @@
 
 #pragma once
+
+#if USE(GLIB)
+#include <wtf/Function.h>
+#endif
 
 #if PLATFORM(MAC)
@@ -61 +65 @@
 #if USE(GLIB)
 double screenDPI();
+void setScreenDPIObserverHandler(Function<void()>&&);
 #endif
 

trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp

@@ -41 +41 @@
 #include <cmath>
 #include <gtk/gtk.h>
+#include <wtf/Optional.h>
 
 namespace WebCore {
@@ -113 +114 @@
 }
 
+static std::optional<Function<void()>> screenDPIObserverHandler;
+
+static void gtkXftDPIChangedCallback()
+{
+    if (screenDPIObserverHandler)
+        (*screenDPIObserverHandler)();
+}
+
+void setScreenDPIObserverHandler(Function<void()>&& handler)
+{
+    static GtkSettings* gtkSettings = gtk_settings_get_default();
+    static unsigned long gtkXftDpiChangedHandlerID = 0;
+
+    if (!handler) {
+        if (gtkSettings && gtkXftDpiChangedHandlerID) {
+            g_signal_handler_disconnect(gtkSettings, gtkXftDpiChangedHandlerID);
+            gtkXftDpiChangedHandlerID = 0;
+        }
+        return;
+    }
+
+    screenDPIObserverHandler = WTFMove(handler);
+    if (gtkSettings && !gtkXftDpiChangedHandlerID)
+        gtkXftDpiChangedHandlerID = g_signal_connect(gtkSettings, "notify::gtk-xft-dpi", G_CALLBACK(gtkXftDPIChangedCallback), nullptr);
+}
+
 static GdkScreen* getScreen(GtkWidget* widget)
 {

trunk/Source/WebCore/platform/wpe/PlatformScreenWPE.cpp

@@ -61 +61 @@
 }
 
+void setScreenDPIObserverHandler(Function<void()>&&)
+{
+    notImplemented();
+}
+
 FloatRect screenRect(Widget*)
 {

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-11-13  Gabriel Ivascu  <givascu@igalia.com>
+
+        [GTK] Automatically adjust font size when gtk-xft-dpi changes
+        https://bugs.webkit.org/show_bug.cgi?id=142673
+
+        Reviewed by Michael Catanzaro.
+
+        * UIProcess/API/glib/WebKitSettings.cpp:
+        (webKitSettingsDispose):
+        (webKitSettingsConstructed):
+        (webkit_settings_class_init):
+
 2017-11-13  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp

@@ -80 +80 @@
     bool allowModalDialogs { false };
     bool zoomTextOnly { false };
+    double screenDpi { 96 };
 };
 
@@ -159 +160 @@
 };
 
+static void webKitSettingsDispose(GObject* object)
+{
+    WebCore::setScreenDPIObserverHandler(nullptr);
+    G_OBJECT_CLASS(webkit_settings_parent_class)->dispose(object);
+}
+
 static void webKitSettingsConstructed(GObject* object)
 {
     G_OBJECT_CLASS(webkit_settings_parent_class)->constructed(object);
 
-    WebPreferences* prefs = WEBKIT_SETTINGS(object)->priv->preferences.get();
+    WebKitSettings* settings = WEBKIT_SETTINGS(object);
+    WebPreferences* prefs = settings->priv->preferences.get();
     prefs->setShouldRespectImageOrientation(true);
+
+    settings->priv->screenDpi = WebCore::screenDPI();
+    WebCore::setScreenDPIObserverHandler([settings]() {
+        auto newScreenDpi = WebCore::screenDPI();
+        if (newScreenDpi == settings->priv->screenDpi)
+            return;
+
+        auto scalingFactor = newScreenDpi / settings->priv->screenDpi;
+        auto prevFontSize = settings->priv->preferences->defaultFontSize();
+        auto prevMonospaceFontSize = settings->priv->preferences->defaultFixedFontSize();
+
+        settings->priv->preferences->setDefaultFontSize(std::round(prevFontSize * scalingFactor));
+        g_object_notify(G_OBJECT(settings), "default-font-size");
+
+        settings->priv->preferences->setDefaultFixedFontSize(std::round(prevMonospaceFontSize * scalingFactor));
+        g_object_notify(G_OBJECT(settings), "default-monospace-font-size");
+
+        settings->priv->screenDpi = newScreenDpi;
+    });
 }
 
@@ -513 +540 @@
     GObjectClass* gObjectClass = G_OBJECT_CLASS(klass);
     gObjectClass->constructed = webKitSettingsConstructed;
+    gObjectClass->dispose = webKitSettingsDispose;
     gObjectClass->set_property = webKitSettingsSetProperty;
     gObjectClass->get_property = webKitSettingsGetProperty;

trunk/Tools/ChangeLog

@@ +1 @@
+2017-11-13  Gabriel Ivascu  <givascu@igalia.com>
+
+        [GTK] Automatically adjust font size when gtk-xft-dpi changes
+        https://bugs.webkit.org/show_bug.cgi?id=142673
+
+        Reviewed by Michael Catanzaro.
+
+        * TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:
+        (testWebKitSettings):
+
 2017-11-13  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp

@@ -169 +169 @@
     g_assert_cmpuint(webkit_settings_font_size_to_points(8), ==, 6);
     g_assert_cmpuint(webkit_settings_font_size_to_points(24), ==, 18);
+
+    // Test font size on DPI change. The font size value in pixels should scale
+    // accordingly, while the font size value in points should remain the same.
+    if (gtkSettings) {
+        // At 96 DPI, 20 pixels is 15 points.
+        webkit_settings_set_default_font_size(settings, 20);
+        g_assert_cmpuint(webkit_settings_font_size_to_points(webkit_settings_get_default_font_size(settings)), ==, 15);
+        // At 96 DPI, 16 pixels is 12 points.
+        webkit_settings_set_default_monospace_font_size(settings, 16);
+        g_assert_cmpuint(webkit_settings_font_size_to_points(webkit_settings_get_default_monospace_font_size(settings)), ==, 12);
+
+        // Set DPI to 120. The scaling factor is 120 / 96 == 1.25.
+        g_object_set(gtkSettings, "gtk-xft-dpi", 120 * 1024, nullptr);
+        g_assert_cmpuint(webkit_settings_get_default_font_size(settings), ==, 25);
+        g_assert_cmpuint(webkit_settings_font_size_to_points(webkit_settings_get_default_font_size(settings)), ==, 15);
+        g_assert_cmpuint(webkit_settings_get_default_monospace_font_size(settings), ==, 20);
+        g_assert_cmpuint(webkit_settings_font_size_to_points(webkit_settings_get_default_monospace_font_size(settings)), ==, 12);
+
+        // Set DPI back to 96. The scaling factor is 96 / 120 == 0.8.
+        g_object_set(gtkSettings, "gtk-xft-dpi", 96 * 1024, nullptr);
+        g_assert_cmpuint(webkit_settings_get_default_font_size(settings), ==, 20);
+        g_assert_cmpuint(webkit_settings_font_size_to_points(webkit_settings_get_default_font_size(settings)), ==, 15);
+        g_assert_cmpuint(webkit_settings_get_default_monospace_font_size(settings), ==, 16);
+        g_assert_cmpuint(webkit_settings_font_size_to_points(webkit_settings_get_default_monospace_font_size(settings)), ==, 12);
+    }
 #endif