Changeset 222800 in webkit

Timestamp:

Oct 3, 2017 12:21:19 PM (7 years ago)

Author:

Adrian Perez de Castro

Message:

[GTK] Support the "system" CSS font family
​https://bugs.webkit.org/show_bug.cgi?id=177755

Reviewed by Carlos Garcia Campos.

Obtain the system UI font from the GtkSettings::gtk-font-name property

Source/WebCore:

Test: platform/gtk/fonts/systemFont.html

• platform/graphics/freetype/FontCacheFreeType.cpp:

(WebCore::getFamilyNameStringFromFamily): Use defaultGtkSystemFont()
to handle -webkit-system-font and -webkit-system-ui.
(WebCore::isCommonlyUsedGenericFamily): Handle -webkit-system-font and
-webkit-system-ui as generic family names.

• platform/graphics/gtk/GtkUtilities.cpp:

(WebCore::defaultGtkSystemFont): Added.

• platform/graphics/gtk/GtkUtilities.h: Add prototype for defaultGtkSystemFont().

LayoutTests:

• platform/gtk/fonts/systemFont-expected.html: Added.
• platform/gtk/fonts/systemFont.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/fonts/systemFont-expected.html (added)
• LayoutTests/platform/gtk/fonts/systemFont.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp (modified) (3 diffs)
• Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp (modified) (1 diff)
• Source/WebCore/platform/gtk/GtkUtilities.cpp (modified) (1 diff)
• Source/WebCore/platform/gtk/GtkUtilities.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-10-03  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK] Support the "system" CSS font family
+        https://bugs.webkit.org/show_bug.cgi?id=177755
+
+        Reviewed by Carlos Garcia Campos.
+
+        Obtain the system UI font from the GtkSettings::gtk-font-name property
+
+        * platform/gtk/fonts/systemFont-expected.html: Added.
+        * platform/gtk/fonts/systemFont.html: Added.
+
 2017-10-03  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-03  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK] Support the "system" CSS font family
+        https://bugs.webkit.org/show_bug.cgi?id=177755
+
+        Reviewed by Carlos Garcia Campos.
+
+        Obtain the system UI font from the GtkSettings::gtk-font-name property
+
+        Test: platform/gtk/fonts/systemFont.html
+
+        * platform/graphics/freetype/FontCacheFreeType.cpp:
+        (WebCore::getFamilyNameStringFromFamily): Use defaultGtkSystemFont()
+        to handle -webkit-system-font and -webkit-system-ui.
+        (WebCore::isCommonlyUsedGenericFamily): Handle -webkit-system-font and
+        -webkit-system-ui as generic family names.
+        * platform/graphics/gtk/GtkUtilities.cpp:
+        (WebCore::defaultGtkSystemFont): Added.
+        * platform/graphics/gtk/GtkUtilities.h: Add prototype for defaultGtkSystemFont().
+
 2017-10-03  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp

@@ -34 +34 @@
 #include <wtf/text/CString.h>
 
+#if PLATFORM(GTK)
+#include "GtkUtilities.h"
+#endif
+
 namespace WebCore {
 
@@ -158 +162 @@
     if (family == fantasyFamily)
         return "fantasy";
+
+#if PLATFORM(GTK)
+    if (family == systemUiFamily || family == "-webkit-system-font")
+        return defaultGtkSystemFont();
+#endif
+
     return "";
 }
@@ -317 +327 @@
         || equalLettersIgnoringASCIICase(familyNameString, "monospace")
         || equalLettersIgnoringASCIICase(familyNameString, "fantasy")
+#if PLATFORM(GTK)
+        || equalLettersIgnoringASCIICase(familyNameString, "-webkit-system-font")
+        || equalLettersIgnoringASCIICase(familyNameString, "-webkit-system-ui")
+#endif
         || equalLettersIgnoringASCIICase(familyNameString, "cursive");
 }

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

@@ -34 +34 @@
 #include <mutex>
 #include <wtf/NeverDestroyed.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WebCore {

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

@@ -65 +65 @@
 }
 
+String defaultGtkSystemFont()
+{
+    GUniqueOutPtr<char> fontString;
+    g_object_get(gtk_settings_get_default(), "gtk-font-name", &fontString.outPtr(), nullptr);
+    // We need to remove the size from the value of the property,
+    // which is separated from the font family using a space.
+    if (auto* spaceChar = strrchr(fontString.get(), ' '))
+        *spaceChar = '\0';
+    return String::fromUTF8(fontString.get());
+}
+
 #if ENABLE(DEVELOPER_MODE)
 static CString topLevelPath()

trunk/Source/WebCore/platform/gtk/GtkUtilities.h

@@ -23 +23 @@
 #include <wtf/WallTime.h>
 #include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
 
 namespace WebCore {
@@ -37 +38 @@
 WallTime wallTimeForEvent(const GdkEvent*);
 
+String defaultGtkSystemFont();
+
 #if ENABLE(DEVELOPER_MODE)
 CString webkitBuildDirectory();