Changeset 295417 in webkit

Timestamp:

Jun 9, 2022, 5:05:35 AM (3 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION(251416@main): Broke GTK...
​https://bugs.webkit.org/show_bug.cgi?id=241460

Patch by Philippe Normand <​philn@igalia.com> on 2022-06-09
Unreviewed, fix GTK build.

• Source/WebCore/platform/graphics/gtk/SystemFontDatabaseGTK.cpp:

(WebCore::SystemFontDatabase::platformSystemFontShorthandInfo):

Canonical link: ​https://commits.webkit.org/251423@main

File:

• trunk/Source/WebCore/platform/graphics/gtk/SystemFontDatabaseGTK.cpp (modified) (2 diffs)

trunk/Source/WebCore/platform/graphics/gtk/SystemFontDatabaseGTK.cpp

@@ -34 +34 @@
 }
 
-auto SystemFontDatabase::platformSystemFontShorthandInfo(FontShorthand fontShorthand) -> SystemFontShorthandInfo
+auto SystemFontDatabase::platformSystemFontShorthandInfo(FontShorthand) -> SystemFontShorthandInfo
 {
     GtkSettings* settings = gtk_settings_get_default();
@@ -55 +55 @@
         size = size * (screenDPI() / 72.0);
 
-    SystemFontShorthandInfo result { AtomString::fromLatin1(pango_font_description_get_family(pangoDescription)), size, normalWeightValue() };
+    SystemFontShorthandInfo result { AtomString::fromLatin1(pango_font_description_get_family(pangoDescription)), static_cast<float>(size), normalWeightValue() };
     pango_font_description_free(pangoDescription);
     return result;