summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksandr Reviakin <aleksandr.reviakin@qt.io>2022-08-23 12:51:52 +0200
committerAleksandr Reviakin <aleksandr.reviakin@qt.io>2022-08-30 15:46:01 +0200
commit89a703dcb88911b9e4dba246024c314b04b1afe7 (patch)
treecd25eeab3340607e24d3f99ee7d487dfaa6606b6
parentbe44827240efbd2f89ad493e209061906a53028c (diff)
wasm: add local-fonts API support
Add support for accessing local fonts via local-fonts API. Local fonts API is available in Chrome 103 and above. Fixes: QTBUG-81736 Change-Id: Iac47b3a30c7a22933cbdbfc97ce0791edb63b5bd Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-rw-r--r--src/plugins/platforms/wasm/qwasmfontdatabase.cpp126
-rw-r--r--src/plugins/platforms/wasm/qwasmfontdatabase.h3
2 files changed, 129 insertions, 0 deletions
diff --git a/src/plugins/platforms/wasm/qwasmfontdatabase.cpp b/src/plugins/platforms/wasm/qwasmfontdatabase.cpp
index 7f90986121..83ebb4911f 100644
--- a/src/plugins/platforms/wasm/qwasmfontdatabase.cpp
+++ b/src/plugins/platforms/wasm/qwasmfontdatabase.cpp
@@ -2,11 +2,34 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include "qwasmfontdatabase.h"
+#include "qwasmintegration.h"
#include <QtCore/qfile.h>
+#include <QtCore/private/qstdweb_p.h>
+#include <QtGui/private/qguiapplication_p.h>
+
+#include <emscripten.h>
+#include <emscripten/val.h>
+#include <emscripten/bind.h>
+
+// FIXME: replace with shared implementation from qstdweb
+QByteArray fromUint8Array(emscripten::val uint8array)
+{
+ qstdweb::ArrayBuffer arrayBuffer(uint8array);
+
+ using qstdweb::Uint8Array;
+ Uint8Array sourceArray(arrayBuffer);
+ if (sourceArray.length() > std::numeric_limits<qsizetype>::max())
+ return QByteArray();
+ QByteArray destinationArray;
+ destinationArray.resize(sourceArray.length());
+ sourceArray.copyTo(destinationArray.data());
+ return destinationArray;
+}
QT_BEGIN_NAMESPACE
+using namespace emscripten;
using namespace Qt::StringLiterals;
void QWasmFontDatabase::populateFontDatabase()
@@ -27,6 +50,103 @@ void QWasmFontDatabase::populateFontDatabase()
QFreeTypeFontDatabase::addTTFile(theFont.readAll(), fontFileName.toLatin1());
}
+
+ // check if local-fonts API is available in the browser
+ val window = val::global("window");
+ val fonts = window["queryLocalFonts"];
+
+ if (fonts.isUndefined())
+ return;
+
+ val navigator = val::global("navigator");
+
+ val permissions = navigator["permissions"];
+
+ val requestLocalFontsPermission = val::object();
+ requestLocalFontsPermission.set("name", std::string("local-fonts"));
+
+ qstdweb::PromiseCallbacks permissionRequestCallbacks {
+ .thenFunc = [window](val status) {
+ qCDebug(lcQpaFonts) << "onFontPermissionSuccess:"
+ << QString::fromStdString(status["state"].as<std::string>());
+
+ // query all available local fonts and call registerFontFamily for each of them
+ qstdweb::Promise::make(window, "queryLocalFonts", {
+ .thenFunc = [](val status) {
+ const int count = status["length"].as<int>();
+ for (int i = 0; i < count; ++i) {
+ val font = status.call<val>("at", i);
+ const std::string family = font["family"].as<std::string>();
+ QFreeTypeFontDatabase::registerFontFamily(QString::fromStdString(family));
+ }
+ QWasmFontDatabase::notifyFontsChanged();
+ },
+ .catchFunc = [](val) {
+ qCWarning(lcQpaFonts)
+ << "Error while trying to query local-fonts API";
+ }
+ });
+ },
+ .catchFunc = [](val error) {
+ qCWarning(lcQpaFonts)
+ << "Error while requesting local-fonts API permission: "
+ << QString::fromStdString(error["name"].as<std::string>());
+ }
+ };
+
+ // request local fonts permission (currently supported only by Chrome 103+)
+ qstdweb::Promise::make(permissions, "request", std::move(permissionRequestCallbacks), std::move(requestLocalFontsPermission));
+}
+
+void QWasmFontDatabase::populateFamily(const QString &familyName)
+{
+ val window = val::global("window");
+
+ auto queryFontsArgument = val::array(std::vector<val>({ val(familyName.toStdString()) }));
+ val queryFont = val::object();
+ queryFont.set("postscriptNames", std::move(queryFontsArgument));
+
+ qstdweb::PromiseCallbacks localFontsQueryCallback {
+ .thenFunc = [](val status) {
+ val font = status.call<val>("at", 0);
+
+ if (font.isUndefined())
+ return;
+
+ qstdweb::PromiseCallbacks blobQueryCallback {
+ .thenFunc = [](val status) {
+ qCDebug(lcQpaFonts) << "onBlobQuerySuccess";
+
+ qstdweb::PromiseCallbacks arrayBufferCallback {
+ .thenFunc = [](val status) {
+ qCDebug(lcQpaFonts) << "onArrayBuffer" ;
+
+ QByteArray fontByteArray = fromUint8Array(status);
+
+ QFreeTypeFontDatabase::addTTFile(fontByteArray, QByteArray());
+
+ QWasmFontDatabase::notifyFontsChanged();
+ },
+ .catchFunc = [](val) {
+ qCWarning(lcQpaFonts) << "onArrayBufferError";
+ }
+ };
+
+ qstdweb::Promise::make(status, "arrayBuffer", std::move(arrayBufferCallback));
+ },
+ .catchFunc = [](val) {
+ qCWarning(lcQpaFonts) << "onBlobQueryError";
+ }
+ };
+
+ qstdweb::Promise::make(font, "blob", std::move(blobQueryCallback));
+ },
+ .catchFunc = [](val) {
+ qCWarning(lcQpaFonts) << "onLocalFontsQueryError";
+ }
+ };
+
+ qstdweb::Promise::make(window, "queryLocalFonts", std::move(localFontsQueryCallback), std::move(queryFont));
}
QFontEngine *QWasmFontDatabase::fontEngine(const QFontDef &fontDef, void *handle)
@@ -60,4 +180,10 @@ QFont QWasmFontDatabase::defaultFont() const
return QFont("Bitstream Vera Sans"_L1);
}
+void QWasmFontDatabase::notifyFontsChanged()
+{
+ QFontCache::instance()->clear();
+ emit qGuiApp->fontDatabaseChanged();
+}
+
QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wasm/qwasmfontdatabase.h b/src/plugins/platforms/wasm/qwasmfontdatabase.h
index ccb71b8e0b..22c550f244 100644
--- a/src/plugins/platforms/wasm/qwasmfontdatabase.h
+++ b/src/plugins/platforms/wasm/qwasmfontdatabase.h
@@ -12,12 +12,15 @@ class QWasmFontDatabase : public QFreeTypeFontDatabase
{
public:
void populateFontDatabase() override;
+ void populateFamily(const QString &familyName) override;
QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override;
QStringList fallbacksForFamily(const QString &family, QFont::Style style,
QFont::StyleHint styleHint,
QChar::Script script) const override;
void releaseHandle(void *handle) override;
QFont defaultFont() const override;
+
+ static void notifyFontsChanged();
};
QT_END_NAMESPACE
#endif