Changeset 292274 in webkit

Timestamp:

Apr 2, 2022, 10:39:31 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_contentSecurityPolicyModeForExtension):
(WebCore::Page::firstTimeInitialization):

• page/Page.h:
• platform/graphics/FontCache.cpp:

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

• platform/graphics/FontCache.h:

Tools:

Make TestRunner::dumpResourceLoadStatistics() clear any currently-recorded statistics.
This avoids the problem where spurious layouts during the time when the page has been created but
before the test has begun record irrelevant statistics.

• WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:

(WTR::InjectedBundle::beginTesting):
(WTR::InjectedBundle::clearResourceLoadStatistics):

• WebKitTestRunner/InjectedBundle/InjectedBundle.h:
• WebKitTestRunner/InjectedBundle/TestRunner.cpp:

(WTR::TestRunner::dumpResourceLoadStatistics):

LayoutTests:

• TestExpectations:
• fast/text/install-font-style-recalc-expected.txt: Added.
• fast/text/install-font-style-recalc.html: Added.
• platform/ios-wk2/TestExpectations:
• platform/mac-wk2/TestExpectations:

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-wk2/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac-wk2/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/Page.cpp (modified) (2 diffs)
• Source/WebCore/page/Page.h (modified) (1 diff)
• Source/WebCore/platform/graphics/FontCache.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/FontCache.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (modified) (2 diffs)
• Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-04-02  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.
+
+        * TestExpectations:
+        * fast/text/install-font-style-recalc-expected.txt: Added.
+        * fast/text/install-font-style-recalc.html: Added.
+        * platform/ios-wk2/TestExpectations:
+        * platform/mac-wk2/TestExpectations:
+
 2022-04-02  Alan Bujtas  <zalan@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -5205 +5205 @@
 # 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-wk2/TestExpectations

@@ -2253 +2253 @@
 
 webkit.org/b/238634 media/video-object-fit.html [ ImageOnlyFailure ]
+
+fast/text/install-font-style-recalc.html [ Pass ]

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -1703 +1703 @@
 webkit.org/b/233621 http/tests/webgpu [ Skip ]
 
-webkit.org/b/238641 fast/text/install-font-style-recalc.html [ Pass ]
+fast/text/install-font-style-recalc.html [ Pass ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-02  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_contentSecurityPolicyModeForExtension):
+        (WebCore::Page::firstTimeInitialization):
+        * page/Page.h:
+        * platform/graphics/FontCache.cpp:
+        (WebCore::Function<void):
+        (WebCore::FontCache::registerFontCacheInvalidationCallback):
+        (WebCore::FontCache::invalidateAllFontCaches):
+        * platform/graphics/FontCache.h:
+
 2022-04-02  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/page/Page.cpp

@@ -357 +357 @@
     m_visitedLinkStore->addPage(*this);
 
-    static bool addedListener;
-    if (!addedListener) {
-        platformStrategies()->loaderStrategy()->addOnlineStateChangeListener(&networkStateChanged);
-        addedListener = true;
+    static bool firstTimeInitializationRan = false;
+    if (!firstTimeInitializationRan) {
+        firstTimeInitialization();
+        firstTimeInitializationRan = true;
     }
 
@@ -432 +432 @@
     m_userContentProvider->removePage(*this);
     m_visitedLinkStore->removePage(*this);
+}
+
+void Page::firstTimeInitialization()
+{
+    platformStrategies()->loaderStrategy()->addOnlineStateChangeListener(&networkStateChanged);
+
+    FontCache::registerFontCacheInvalidationCallback([] {
+        forEachPage([](auto& page) {
+            page.setNeedsRecalcStyleInAllFrames();
+        });
+    });
 }
 

trunk/Source/WebCore/page/Page.h

@@ -968 +968 @@
     void logNavigation(const Navigation&);
 
+    static void firstTimeInitialization();
+
     WEBCORE_EXPORT void initGroup();
 

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();
 

trunk/Tools/ChangeLog

@@ +1 @@
+2022-04-02  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.
+
+        Make TestRunner::dumpResourceLoadStatistics() clear any currently-recorded statistics.
+        This avoids the problem where spurious layouts during the time when the page has been created but
+        before the test has begun record irrelevant statistics.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::beginTesting):
+        (WTR::InjectedBundle::clearResourceLoadStatistics):
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        (WTR::TestRunner::dumpResourceLoadStatistics):
+
 2022-04-02  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp

@@ -544 +544 @@
     WKBundlePageClearApplicationCache(page()->page());
     WKBundleResetOriginAccessAllowLists(m_bundle.get());
-    WKBundleClearResourceLoadStatistics(m_bundle.get());
+    clearResourceLoadStatistics();
 
     // [WK2] REGRESSION(r128623): It made layout tests extremely slow
@@ -575 +575 @@
 
     m_state = Idle;
+}
+
+void InjectedBundle::clearResourceLoadStatistics()
+{
+    WKBundleClearResourceLoadStatistics(m_bundle.get());
 }
 

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h

@@ -151 +151 @@
     size_t userScriptInjectedCount() const { return m_userScriptInjectedCount; }
 
+    void clearResourceLoadStatistics();
+
 private:
     InjectedBundle() = default;

trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

@@ -1347 +1347 @@
 void TestRunner::dumpResourceLoadStatistics()
 {
+    InjectedBundle::singleton().clearResourceLoadStatistics();
     postSynchronousPageMessage("dumpResourceLoadStatistics");
 }