[webkit-changes] [WebKit/WebKit] 9ccc5c: [GLIB] Unify code for accessing default `cairo_fon...

[Vitaly Dyachkov]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 9ccc5caacd23526def9cf7111283b5233be038e1
      https://github.com/WebKit/WebKit/commit/9ccc5caacd23526def9cf7111283b5233be038e1
  Author: Vitaly Dyachkov <vitaly at igalia.com>
  Date:   2023-02-15 (Wed, 15 Feb 2023)

  Changed paths:
    M Source/WebCore/platform/Cairo.cmake
    M Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp
    M Source/WebCore/platform/graphics/cairo/CairoUtilities.h
    M Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp
    M Source/WebKit/WebProcess/glib/WebProcessGLib.cpp
    M Source/WebKit/WebProcess/gtk/GtkSettingsManagerProxy.cpp
    M Source/WebKit/WebProcess/gtk/GtkSettingsManagerProxy.h
    M Tools/TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp

  Log Message:
  -----------
  [GLIB] Unify code for accessing default `cairo_font_options`
https://bugs.webkit.org/show_bug.cgi?id=252057

Reviewed by Carlos Garcia Campos.

Currently, there are two different implementations of
`getDefaultCairoFontOptions()` on WPE and GTK.

WPE version simply returns a static value created by
`cairo_font_options_create()`, whereas GTK one is creating a singleton
class that stores and updates an instance variable to keep it in sync
with `GtkSettings`.

This patch makes `getDefaultCairoFontOptions()` simply return a static
value and adds `setDefaultCairoFontOptions()` function. GTK port use it
to set a new value when `GtkSettingsManagerProxy` applies new settings.

* Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp:
(WebCore::getDefaultCairoFontOptions):
(WebCore::setDefaultCairoFontOptions):
* Source/WebCore/platform/graphics/cairo/CairoUtilities.h:
* Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp:
(WebCore::SystemFontOptions::singleton): Deleted.
(WebCore::SystemFontOptions::SystemFontOptions): Deleted.
(WebCore::SystemFontOptions::fontOptions const): Deleted.
(WebCore::SystemFontOptions::updateFontOptions): Deleted.
(WebCore::getDefaultCairoFontOptions): Deleted.
* Source/WebKit/WebProcess/gtk/GtkSettingsManagerProxy.cpp:
(WebKit::GtkSettingsManagerProxy::applySettings):
(WebKit::GtkSettingsManagerProxy::applyFontOptions):
* Source/WebKit/WebProcess/gtk/GtkSettingsManagerProxy.h:

Canonical link: https://commits.webkit.org/260301@main