Merge branch 'font-families-cache' into asset-api-v2-font-families-cache

Author: mnutt

.github/workflows/build_cmake.yml

@@ -195,17 +195,17 @@ jobs:
     - name: Build (Linux)
       if: runner.os == 'Linux'
       shell: bash --noprofile --norc -eo pipefail -x {0}
-      run: ninja -C build -j $HOST_N_CORES -v
+      run: ninja -C build -j $HOST_N_CORES
 
     - name: Build (MSVC/Conan)
       if: runner.os == 'Windows' && matrix.config.environment_script != ''
       shell: cmd
-      run: py Tools\qt\build-qtwebkit-conan.py --build --install --ninjaargs="-j %HOST_N_CORES% -v" || exit /b 1
+      run: py Tools\qt\build-qtwebkit-conan.py --build --install --ninjaargs="-j %HOST_N_CORES%" || exit /b 1
 
     - name: Build (macOS/Conan)
       if: runner.os == 'macOS'
       shell: bash --noprofile --norc -eo pipefail -x {0}
-      run: Tools/qt/build-qtwebkit-conan.py --build --install --ninjaargs="-j $HOST_N_CORES -v"
+      run: Tools/qt/build-qtwebkit-conan.py --build --install --ninjaargs="-j $HOST_N_CORES"
 
     # - name: Verify (Linux)
     #   if: runner.os == 'Linux'

Source/WebCore/platform/graphics/FontCache.h

@@ -257,6 +257,10 @@ class FontCache : public CanMakeCheckedPtr<FontCache> {
     UncheckedKeyHashSet<AtomString> m_knownFamilies;
 #endif
 
+#if PLATFORM(QT)
+    UncheckedKeyHashMap<AtomString, bool> m_fontFamilyCache;
+#endif
+
 #if PLATFORM(COCOA)
     FontDatabase m_databaseAllowingUserInstalledFonts { AllowUserInstalledFonts::Yes };
     FontDatabase m_databaseDisallowingUserInstalledFonts { AllowUserInstalledFonts::No };

Source/WebCore/platform/graphics/qt/FontCacheQt.cpp

@@ -96,7 +96,11 @@ Ref<Font> FontCache::lastResortFallbackFont(const FontDescription& fontDescripti
 
 std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomString& family, const FontCreationContext&, OptionSet<FontLookupOptions>)
 {
-    if (!QFontDatabase::hasFamily(family.string()))
+    auto addResult = m_fontFamilyCache.ensure(family, [&family] {
+        return QFontDatabase::hasFamily(family.string());
+    });
+
+    if (!addResult.iterator->value)
         return nullptr;
     return std::make_unique<FontPlatformData>(fontDescription, family);
 }

Tools/QtTestBrowser/launcherwindow.cpp

@@ -67,6 +67,7 @@
 #include <QFileInfo>
 #include <QMessageBox>
 #include <QNetworkReply>
+#include <QSslError>
 #endif
 
 #if !defined(QT_NO_NETWORKDISKCACHE) && !defined(QT_NO_DESKTOPSERVICES)
@@ -107,8 +108,10 @@ LauncherWindow::LauncherWindow(WindowOptions* data, QGraphicsScene* sharedScene)
     createChrome();
 #if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
     connect(page(), SIGNAL(downloadRequested(const QNetworkRequest&)), this, SLOT(downloadRequest(const QNetworkRequest&)));
+#if !defined(QT_NO_SSL)
     connect(page()->networkAccessManager(), SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)),
             this, SLOT(showSSLErrorConfirmation(QNetworkReply*, const QList<QSslError>&)));
+#endif // QT_NO_SSL
 #endif
 }
 
@@ -1160,6 +1163,7 @@ void LauncherWindow::showUserAgentDialog()
 
 void LauncherWindow::showSSLErrorConfirmation(QNetworkReply* reply, const QList<QSslError>& errors)
 {
+#ifndef QT_NO_SSL
     QString errorStrings = "<ul>";
     for (const QSslError& error : errors)
         errorStrings += "<li>" + error.errorString() + "</li>";
@@ -1173,6 +1177,7 @@ void LauncherWindow::showSSLErrorConfirmation(QNetworkReply* reply, const QList<
     sslWarningBox.setIcon(QMessageBox::Warning);
     if (sslWarningBox.exec() == QMessageBox::Ignore)
         reply->ignoreSslErrors();
+#endif
 }
 
 void LauncherWindow::loadURLListFromFile()