Changeset 292072 in webkit

Timestamp:

Mar 29, 2022, 2:49:38 PM (4 years ago)

Author:

mmaxfield@apple.com

Message:

[Cocoa] Automatically relayout the page when new fonts are installed
​https://bugs.webkit.org/show_bug.cgi?id=238483
<rdar://problem/80544133>

Reviewed by Chris Dumez.

Source/WebCore:

This patch simply calls setNeedsRecalcStyleInAllFrames on every Page when we receive a
kCTFontManagerRegisteredFontsChangedNotification.

FontCache::invalidateAllFontCaches() can't do this directly because it's in platform/ and
therefore isn't allowed to know what Pages are. Instead, this patch takes a process-global
callback and calls that instead. This callback is set at initialization time.

Test: fast/text/install-font-style-recalc.html

• page/Page.cpp:

(WebCore::m_attachmentElementClient):

• platform/graphics/FontCache.cpp:

(WebCore::Function<void):
(WebCore::FontCache::registerFontCacheInvalidationCallback):
(WebCore::FontCache::invalidateAllFontCaches):

• platform/graphics/FontCache.h:

LayoutTests:

• fast/text/install-font-style-recalc-expected.txt: Added.
• fast/text/install-font-style-recalc.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/fast/text/install-font-style-recalc-expected.txt (added)
• LayoutTests/fast/text/install-font-style-recalc.html (added)
• LayoutTests/platform/ios/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/Page.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/FontCache.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/FontCache.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-03-29  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [Cocoa] Automatically relayout the page when new fonts are installed
+        https://bugs.webkit.org/show_bug.cgi?id=238483
+        <rdar://problem/80544133>
+
+        Reviewed by Chris Dumez.
+
+        * fast/text/install-font-style-recalc-expected.txt: Added.
+        * fast/text/install-font-style-recalc.html: Added.
+
 2022-03-29  Arcady Goldmints-Orlov  <agoldmints@igalia.com>
 

trunk/LayoutTests/TestExpectations

@@ -5209 +5209 @@
 # Only certain ports have WebGPU implementations.
 http/tests/webgpu [ Failure ImageOnlyFailure Pass Timeout ]
+
+# Only some ports automatically relayout if a font is installed while the page is open
+fast/text/install-font-style-recalc.html [ Failure ]

trunk/LayoutTests/platform/ios/TestExpectations

@@ -3568 +3568 @@
 # iOS has a WebGPU implementation.
 http/tests/webgpu [ Pass ]
+
+fast/text/install-font-style-recalc.html [ Pass ]

trunk/LayoutTests/platform/mac/TestExpectations

@@ -2416 +2416 @@
 # macOS has a WebGPU implementation.
 http/tests/webgpu [ Pass ]
+
+fast/text/install-font-style-recalc.html [ Pass ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-29  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [Cocoa] Automatically relayout the page when new fonts are installed
+        https://bugs.webkit.org/show_bug.cgi?id=238483
+        <rdar://problem/80544133>
+
+        Reviewed by Chris Dumez.
+
+        This patch simply calls setNeedsRecalcStyleInAllFrames on every Page when we receive a
+        kCTFontManagerRegisteredFontsChangedNotification.
+
+        FontCache::invalidateAllFontCaches() can't do this directly because it's in platform/ and
+        therefore isn't allowed to know what Pages are. Instead, this patch takes a process-global
+        callback and calls that instead. This callback is set at initialization time.
+
+        Test: fast/text/install-font-style-recalc.html
+
+        * page/Page.cpp:
+        (WebCore::m_attachmentElementClient):
+        * platform/graphics/FontCache.cpp:
+        (WebCore::Function<void):
+        (WebCore::FontCache::registerFontCacheInvalidationCallback):
+        (WebCore::FontCache::invalidateAllFontCaches):
+        * platform/graphics/FontCache.h:
+
 2022-03-29  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/page/Page.cpp

@@ -389 +389 @@
     if (m_lowPowerModeNotifier->isLowPowerModeEnabled())
         m_throttlingReasons.add(ThrottlingReason::LowPowerMode);
+
+    static bool fontCacheInvalidationCallbackRegistered = false;
+    if (!fontCacheInvalidationCallbackRegistered) {
+        FontCache::registerFontCacheInvalidationCallback([] {
+            forEachPage([](auto& page) {
+                page.setNeedsRecalcStyleInAllFrames();
+            });
+        });
+        fontCacheInvalidationCallbackRegistered = true;
+    }
 }
 

trunk/Source/WebCore/platform/graphics/FontCache.cpp

@@ -490 +490 @@
 }
 
+static Function<void()>& fontCacheInvalidationCallback()
+{
+    static NeverDestroyed<Function<void()>> callback;
+    return callback.get();
+}
+
+void FontCache::registerFontCacheInvalidationCallback(Function<void()>&& callback)
+{
+    fontCacheInvalidationCallback() = WTFMove(callback);
+}
+
 void FontCache::invalidateAllFontCaches()
 {
@@ -496 +507 @@
     // FIXME: Invalidate FontCaches in workers too.
     FontCache::forCurrentThread().invalidate();
+
+    if (fontCacheInvalidationCallback())
+        fontCacheInvalidationCallback()();
 }
 

trunk/Source/WebCore/platform/graphics/FontCache.h

@@ -329 +329 @@
     unsigned short generation() const { return m_generation; }
     WEBCORE_EXPORT void invalidate();
+    static void registerFontCacheInvalidationCallback(Function<void()>&&);
     WEBCORE_EXPORT static void invalidateAllFontCaches();