Changeset 273726 in webkit

Timestamp:

Mar 2, 2021, 2:13:56 AM (6 years ago)

Author:

Chris Lord

Message:

Remove document accessor on CSSFontSelector
​https://bugs.webkit.org/show_bug.cgi?id=222550

Reviewed by Darin Adler.

Replace FontSelector::document() with FontSelector::scriptExecutionContext().

No new tests because there is no behavior change.

• css/CSSFontFace.cpp:

(WebCore::CSSFontFace::appendSources):
(WebCore::CSSFontFace::create):
(WebCore::CSSFontFace::CSSFontFace):

• css/CSSFontFace.h:
• css/CSSFontFaceSet.cpp:

(WebCore::CSSFontFaceSet::ensureLocalFontFacesForFamilyRegistered):

• css/CSSFontSelector.cpp:

(WebCore::CSSFontSelector::scriptExecutionContext const):
(WebCore::CSSFontSelector::fontStyleUpdateNeeded):

• css/CSSFontSelector.h:
• css/FontFace.cpp:

(WebCore::FontFace::FontFace):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSFontFace.cpp (modified) (4 diffs)
• css/CSSFontFace.h (modified) (4 diffs)
• css/CSSFontFaceSet.cpp (modified) (1 diff)
• css/CSSFontSelector.cpp (modified) (2 diffs)
• css/CSSFontSelector.h (modified) (1 diff)
• css/FontFace.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-02  Chris Lord  <clord@igalia.com>
+
+        Remove document accessor on CSSFontSelector
+        https://bugs.webkit.org/show_bug.cgi?id=222550
+
+        Reviewed by Darin Adler.
+
+        Replace FontSelector::document() with FontSelector::scriptExecutionContext().
+
+        No new tests because there is no behavior change.
+
+        * css/CSSFontFace.cpp:
+        (WebCore::CSSFontFace::appendSources):
+        (WebCore::CSSFontFace::create):
+        (WebCore::CSSFontFace::CSSFontFace):
+        * css/CSSFontFace.h:
+        * css/CSSFontFaceSet.cpp:
+        (WebCore::CSSFontFaceSet::ensureLocalFontFacesForFamilyRegistered):
+        * css/CSSFontSelector.cpp:
+        (WebCore::CSSFontSelector::scriptExecutionContext const):
+        (WebCore::CSSFontSelector::fontStyleUpdateNeeded):
+        * css/CSSFontSelector.h:
+        * css/FontFace.cpp:
+        (WebCore::FontFace::FontFace):
+
 2021-03-01  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/css/CSSFontFace.cpp

@@ -63 +63 @@
 }
 
-void CSSFontFace::appendSources(CSSFontFace& fontFace, CSSValueList& srcList, Document* document, bool isInitiatingElementInUserAgentShadowTree)
+void CSSFontFace::appendSources(CSSFontFace& fontFace, CSSValueList& srcList, ScriptExecutionContext* context, bool isInitiatingElementInUserAgentShadowTree)
 {
     for (auto& src : srcList) {
@@ -75 +75 @@
         fontFaceElement = item.svgFontFaceElement();
         if (!item.isLocal()) {
-            const Settings* settings = document ? &document->settings() : nullptr;
-            bool allowDownloading = foundSVGFont || (settings && settings->downloadableBinaryFontsEnabled());
-            if (allowDownloading && item.isSupportedFormat() && document) {
-                if (CachedFont* cachedFont = item.cachedFont(document, foundSVGFont, isInitiatingElementInUserAgentShadowTree))
-                    source = makeUnique<CSSFontFaceSource>(fontFace, item.resource(), document->fontSelector(), *cachedFont);
+            const auto* settings = context ? &context->settingsValues() : nullptr;
+            bool allowDownloading = foundSVGFont || (settings && settings->downloadableBinaryFontsEnabled);
+            if (allowDownloading && item.isSupportedFormat() && is<Document>(context)) {
+                auto& document = downcast<Document>(*context);
+                if (CachedFont* cachedFont = item.cachedFont(&document, foundSVGFont, isInitiatingElementInUserAgentShadowTree))
+                    source = makeUnique<CSSFontFaceSource>(fontFace, item.resource(), document.fontSelector(), *cachedFont);
             }
         } else
@@ -93 +94 @@
 Ref<CSSFontFace> CSSFontFace::create(CSSFontSelector* fontSelector, StyleRuleFontFace* cssConnection, FontFace* wrapper, bool isLocalFallback)
 {
-    auto result = adoptRef(*new CSSFontFace((fontSelector && fontSelector->document()) ? &fontSelector->document()->settings() : nullptr, cssConnection, wrapper, isLocalFallback));
+    auto* context = fontSelector ? fontSelector->scriptExecutionContext() : nullptr;
+    const auto* settings = context ? &context->settingsValues() : nullptr;
+    auto result = adoptRef(*new CSSFontFace(settings, cssConnection, wrapper, isLocalFallback));
     if (fontSelector)
         result->addClient(*fontSelector);
@@ -99 +102 @@
 }
 
-CSSFontFace::CSSFontFace(const Settings* settings, StyleRuleFontFace* cssConnection, FontFace* wrapper, bool isLocalFallback)
+CSSFontFace::CSSFontFace(const Settings::Values* settings, StyleRuleFontFace* cssConnection, FontFace* wrapper, bool isLocalFallback)
     : m_cssConnection(cssConnection)
     , m_wrapper(makeWeakPtr(wrapper))
     , m_isLocalFallback(isLocalFallback)
     , m_mayBePurged(!wrapper)
-    , m_shouldIgnoreFontLoadCompletions(settings && settings->shouldIgnoreFontLoadCompletions())
-    , m_fontLoadTimingOverride(settings ? settings->fontLoadTimingOverride() : FontLoadTimingOverride::None)
-    , m_allowUserInstalledFonts(settings && !settings->shouldAllowUserInstalledFonts() ? AllowUserInstalledFonts::No : AllowUserInstalledFonts::Yes)
+    , m_shouldIgnoreFontLoadCompletions(settings && settings->shouldIgnoreFontLoadCompletions)
+    , m_fontLoadTimingOverride(settings ? settings->fontLoadTimingOverride : FontLoadTimingOverride::None)
+    , m_allowUserInstalledFonts(settings && !settings->shouldAllowUserInstalledFonts ? AllowUserInstalledFonts::No : AllowUserInstalledFonts::Yes)
     , m_timeoutTimer(*this, &CSSFontFace::timeoutFired)
 {

trunk/Source/WebCore/css/CSSFontFace.h

@@ -26 +26 @@
 #pragma once
 
-#include "FontLoadTimingOverride.h"
 #include "FontSelectionValueInlines.h"
 #include "FontTaggedSettings.h"
+#include "Settings.h"
 #include "StyleRule.h"
 #include "TextFlags.h"
-#include "Timer.h"
 #include <memory>
 #include <wtf/Forward.h>
 #include <wtf/HashSet.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
 #include <wtf/WeakPtr.h>
 
@@ -50 +47 @@
 class CSSValue;
 class CSSValueList;
-class Document;
 class FontDescription;
 class Font;
@@ -121 +117 @@
     RefPtr<Font> font(const FontDescription&, bool syntheticBold, bool syntheticItalic, ExternalResourceDownloadPolicy);
 
-    static void appendSources(CSSFontFace&, CSSValueList&, Document*, bool isInitiatingElementInUserAgentShadowTree);
+    static void appendSources(CSSFontFace&, CSSValueList&, ScriptExecutionContext*, bool isInitiatingElementInUserAgentShadowTree);
 
     class Client {
@@ -165 +161 @@
 
 private:
-    CSSFontFace(const Settings*, StyleRuleFontFace*, FontFace*, bool isLocalFallback);
+    CSSFontFace(const Settings::Values*, StyleRuleFontFace*, FontFace*, bool isLocalFallback);
 
     size_t pump(ExternalResourceDownloadPolicy);

trunk/Source/WebCore/css/CSSFontFaceSet.cpp

@@ -109 +109 @@
 
     AllowUserInstalledFonts allowUserInstalledFonts = AllowUserInstalledFonts::Yes;
-    if (m_owningFontSelector->document())
-        allowUserInstalledFonts = m_owningFontSelector->document()->settings().shouldAllowUserInstalledFonts() ? AllowUserInstalledFonts::Yes : AllowUserInstalledFonts::No;
+    if (m_owningFontSelector->scriptExecutionContext())
+        allowUserInstalledFonts = m_owningFontSelector->scriptExecutionContext()->settingsValues().shouldAllowUserInstalledFonts ? AllowUserInstalledFonts::Yes : AllowUserInstalledFonts::No;
     Vector<FontSelectionCapabilities> capabilities = FontCache::singleton().getFontSelectionCapabilitiesInFamily(familyName, allowUserInstalledFonts);
     if (capabilities.isEmpty())

trunk/Source/WebCore/css/CSSFontSelector.cpp

@@ -232 +232 @@
 }
 
+ScriptExecutionContext* CSSFontSelector::scriptExecutionContext() const
+{
+    // This class returns a ScriptExecutionContext despite holding a Document as preparation for a future
+    // where it will actually hold a ScriptExecutionContext (which would be either a Document or a
+    // WorkerGlobalScope, in the case of using fonts in OffscreenCanvas).
+    return m_document.get();
+}
+
 void CSSFontSelector::dispatchInvalidationCallbacks()
 {
@@ -262 +270 @@
 void CSSFontSelector::fontStyleUpdateNeeded(CSSFontFace&)
 {
-    if (document())
-        document()->updateStyleIfNeeded();
+    if (m_document)
+        m_document->updateStyleIfNeeded();
 }
 

trunk/Source/WebCore/css/CSSFontSelector.h

@@ -78 +78 @@
     void unregisterForInvalidationCallbacks(FontSelectorClient&) final;
 
-    Document* document() const { return m_document.get(); }
+    ScriptExecutionContext* scriptExecutionContext() const;
 
     void beginLoadingFontSoon(CachedFont&);

trunk/Source/WebCore/css/FontFace.cpp

@@ -149 +149 @@
 
 FontFace::FontFace(CSSFontSelector& fontSelector)
-    : ActiveDOMObject(fontSelector.document())
+    : ActiveDOMObject(fontSelector.scriptExecutionContext())
     , m_backing(CSSFontFace::create(&fontSelector, nullptr, this))
     , m_loadedPromise(makeUniqueRef<LoadedPromise>(*this, &FontFace::loadedPromiseResolve))