1 files changed, 38 insertions, 49 deletions

diff --git a/src/gui/text/qfontdatabase_p.h b/src/gui/text/qfontdatabase_p.h
index bf7efc27ef..38e1b4ad20 100644
--- a/src/gui/text/qfontdatabase_p.h
+++ b/src/gui/text/qfontdatabase_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QFONTDATABASE_P_H
 #define QFONTDATABASE_P_H
@@ -54,9 +18,12 @@
 #include <QtCore/qcache.h>
 
 #include <QtGui/qfontdatabase.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
+struct QtFontDesc;
+
 struct QtFontFallbacksCacheKey
 {
     QString family;
@@ -207,7 +174,7 @@ struct Q_GUI_EXPORT QtFontFamily
     bool matchesFamilyName(const QString &familyName) const;
     QtFontFoundry *foundry(const QString &f, bool = false);
 
-    void ensurePopulated();
+    bool ensurePopulated();
 };
 
 class Q_GUI_EXPORT QFontDatabasePrivate
@@ -220,9 +187,11 @@ public:
     { }
 
     ~QFontDatabasePrivate() {
-        free();
+        clearFamilies();
     }
 
+    void clearFamilies();
+
     enum FamilyRequestFlags {
         RequestFamily = 0,
         EnsureCreated,
@@ -230,23 +199,25 @@ public:
     };
 
     QtFontFamily *family(const QString &f, FamilyRequestFlags flags = EnsurePopulated);
-    void free() {
-        while (count--)
-            delete families[count];
-        ::free(families);
-        families = nullptr;
-        count = 0;
-        // don't clear the memory fonts!
-    }
 
     int count;
     QtFontFamily **families;
+    bool populated = false;
+
+    QHash<QChar::Script, QStringList> applicationFallbackFontFamilies;
 
     QCache<QtFontFallbacksCacheKey, QStringList> fallbacksCache;
     struct ApplicationFont {
         QString fileName;
+
+        // Note: The data may be implicitly shared throughout the
+        // font database and platform font database, so be careful
+        // to never detach when accessing this member!
         QByteArray data;
 
+        bool isNull() const { return fileName.isEmpty(); }
+        bool isPopulated() const { return !properties.isEmpty(); }
+
         struct Properties {
             QString familyName;
             QString styleName;
@@ -263,7 +234,6 @@ public:
 
     static QFontDatabasePrivate *instance();
 
-    static void createDatabase();
     static void parseFontName(const QString &name, QString &foundry, QString &family);
     static QString resolveFontFamilyAlias(const QString &family);
     static QFontEngine *findFont(const QFontDef &request,
@@ -273,6 +243,25 @@ public:
     static QFontDatabasePrivate *ensureFontDatabase();
 
     void invalidate();
+
+private:
+    static int match(int script, const QFontDef &request, const QString &family_name,
+                     const QString &foundry_name, QtFontDesc *desc, const QList<int> &blacklistedFamilies,
+                     unsigned int *resultingScore = nullptr);
+
+    static unsigned int bestFoundry(int script, unsigned int score, int styleStrategy,
+                            const QtFontFamily *family, const QString &foundry_name,
+                            QtFontStyle::Key styleKey, int pixelSize, char pitch,
+                            QtFontDesc *desc, const QString &styleName = QString());
+
+    static QFontEngine *loadSingleEngine(int script, const QFontDef &request,
+                            QtFontFamily *family, QtFontFoundry *foundry,
+                            QtFontStyle *style, QtFontSize *size);
+
+    static QFontEngine *loadEngine(int script, const QFontDef &request,
+                            QtFontFamily *family, QtFontFoundry *foundry,
+                            QtFontStyle *style, QtFontSize *size);
+
 };
 Q_DECLARE_TYPEINFO(QFontDatabasePrivate::ApplicationFont, Q_RELOCATABLE_TYPE);