Diff
Modified: trunk/Source/WebCore/ChangeLog (224775 => 224776)
--- trunk/Source/WebCore/ChangeLog 2017-11-13 21:41:55 UTC (rev 224775)
+++ trunk/Source/WebCore/ChangeLog 2017-11-13 21:42:54 UTC (rev 224776)
@@ -1,3 +1,17 @@
+2017-11-13 Gabriel Ivascu <[email protected]>
+
+ [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 <[email protected]>
Unreviewed, rolling out r224763.
Modified: trunk/Source/WebCore/platform/PlatformScreen.h (224775 => 224776)
--- trunk/Source/WebCore/platform/PlatformScreen.h 2017-11-13 21:41:55 UTC (rev 224775)
+++ trunk/Source/WebCore/platform/PlatformScreen.h 2017-11-13 21:42:54 UTC (rev 224776)
@@ -25,6 +25,10 @@
#pragma once
+#if USE(GLIB)
+#include <wtf/Function.h>
+#endif
+
#if PLATFORM(MAC)
OBJC_CLASS NSScreen;
OBJC_CLASS NSWindow;
@@ -60,6 +64,7 @@
bool screenHasInvertedColors();
#if USE(GLIB)
double screenDPI();
+void setScreenDPIObserverHandler(Function<void()>&&);
#endif
FloatRect screenRect(Widget*);
Modified: trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp (224775 => 224776)
--- trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp 2017-11-13 21:41:55 UTC (rev 224775)
+++ trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp 2017-11-13 21:42:54 UTC (rev 224776)
@@ -40,6 +40,7 @@
#include <cmath>
#include <gtk/gtk.h>
+#include <wtf/Optional.h>
namespace WebCore {
@@ -112,6 +113,32 @@
return cachedDpi;
}
+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)
{
return gtk_widget_has_screen(widget) ? gtk_widget_get_screen(widget) : gdk_screen_get_default();
Modified: trunk/Source/WebCore/platform/wpe/PlatformScreenWPE.cpp (224775 => 224776)
--- trunk/Source/WebCore/platform/wpe/PlatformScreenWPE.cpp 2017-11-13 21:41:55 UTC (rev 224775)
+++ trunk/Source/WebCore/platform/wpe/PlatformScreenWPE.cpp 2017-11-13 21:42:54 UTC (rev 224776)
@@ -60,6 +60,11 @@
return 96;
}
+void setScreenDPIObserverHandler(Function<void()>&&)
+{
+ notImplemented();
+}
+
FloatRect screenRect(Widget*)
{
notImplemented();
Modified: trunk/Source/WebKit/ChangeLog (224775 => 224776)
--- trunk/Source/WebKit/ChangeLog 2017-11-13 21:41:55 UTC (rev 224775)
+++ trunk/Source/WebKit/ChangeLog 2017-11-13 21:42:54 UTC (rev 224776)
@@ -1,3 +1,15 @@
+2017-11-13 Gabriel Ivascu <[email protected]>
+
+ [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 <[email protected]>
Implement "Service Worker Has No Pending Events" / "Update Service Worker Extended Events Set" algorithms
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp (224775 => 224776)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2017-11-13 21:41:55 UTC (rev 224775)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2017-11-13 21:42:54 UTC (rev 224776)
@@ -79,6 +79,7 @@
CString userAgent;
bool allowModalDialogs { false };
bool zoomTextOnly { false };
+ double screenDpi { 96 };
};
/**
@@ -158,12 +159,38 @@
#endif
};
+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;
+ });
}
static void webKitSettingsSetProperty(GObject* object, guint propId, const GValue* value, GParamSpec* paramSpec)
@@ -512,6 +539,7 @@
{
GObjectClass* gObjectClass = G_OBJECT_CLASS(klass);
gObjectClass->constructed = webKitSettingsConstructed;
+ gObjectClass->dispose = webKitSettingsDispose;
gObjectClass->set_property = webKitSettingsSetProperty;
gObjectClass->get_property = webKitSettingsGetProperty;
Modified: trunk/Tools/ChangeLog (224775 => 224776)
--- trunk/Tools/ChangeLog 2017-11-13 21:41:55 UTC (rev 224775)
+++ trunk/Tools/ChangeLog 2017-11-13 21:42:54 UTC (rev 224776)
@@ -1,3 +1,13 @@
+2017-11-13 Gabriel Ivascu <[email protected]>
+
+ [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 <[email protected]>
check-webkit-style cannot construct valid iOS version without an iOS SDK
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp (224775 => 224776)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp 2017-11-13 21:41:55 UTC (rev 224775)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp 2017-11-13 21:42:54 UTC (rev 224776)
@@ -168,6 +168,31 @@
// At 96 DPI, 8 pixels is 6 points and 24 pixels is 18 points.
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
// Default charset is "iso-8859-1".
