Merge tag 'v6.2.9-lts' into tqtc/lts-6.2-opensource6.2.9

Qt 6.2.9-lts release Conflicts solved: dependencies.yaml examples/webenginewidgets/push-notifications/CMakeLists.txt Change-Id: I0127c2575369f6939df89f3301659470d481b9bf
author: Tarja Sundqvist <tarja.sundqvist@qt.io> 2024-06-11 13:21:32 +0300
committer: Tarja Sundqvist <tarja.sundqvist@qt.io> 2024-06-11 13:31:01 +0300
commit: 3cd4e0aa7961889eb06374885ed648f5b9bd85bc (patch)
tree: 6a089aedea155b1f1a74b553f4d1b57c70554a8f /src/core/api
parent: 6d029165d1593c514db08c34d6b08a00a4435d5e (diff)
parent: 38063a6332b9f948a0381763271e9a9ac7af0999 (diff)
17 files changed, 221 insertions, 112 deletions
diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt
index 2d493c04c..922adfd8c 100644
--- a/src/core/api/CMakeLists.txt
+++ b/src/core/api/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS Gui Network Quick)
 find_package(Qt6 ${PROJECT_VERSION} QUIET OPTIONAL_COMPONENTS WebChannel Positioning)
 
@@ -71,6 +74,10 @@ qt_internal_extend_target(WebEngineCore CONDITION QT_FEATURE_webengine_geolocati
         Qt::Positioning
 )
 
+get_install_config(config)
+get_architectures(archs)
+list(GET archs 0 arch)
+
 ##
 #  DOCS
 ##
@@ -79,18 +86,16 @@ qt_internal_add_docs(WebEngineCore
     ../doc/qtwebengine.qdocconf
 )
 
-add_custom_command(
-    OUTPUT chromium_attributions.qdoc
-    COMMAND ${Python3_EXECUTABLE} chromium/tools/licenses.py
-        --file-template ../core/doc/about_credits.tmpl
-        --entry-template ../core/doc/about_credits_entry.tmpl
-        credits ${CMAKE_CURRENT_BINARY_DIR}/chromium_attributions.qdoc
-    DEPENDS ../doc/about_credits.tmpl ../doc/about_credits_entry.tmpl
-    WORKING_DIRECTORY ${WEBENGINE_ROOT_SOURCE_DIR}/src/3rdparty
-    USES_TERMINAL
+add_code_attributions_target(
+    TARGET generate_chromium_attributions
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/chromium_attributions.qdoc
+    GN_TARGET :QtWebEngineCore
+    FILE_TEMPLATE ../doc/about_credits.tmpl
+    ENTRY_TEMPLATE ../doc/about_credits_entry.tmpl
+    BUILDDIR ${buildDir}/${config}/${arch}
 )
-add_custom_target(generate_chromium_attributions DEPENDS chromium_attributions.qdoc)
-add_dependencies(generate_docs_WebEngineCore generate_chromium_attributions)
+add_dependencies(generate_chromium_attributions run_core_GnDone)
+add_dependencies(docs generate_chromium_attributions)
 
 ##
 #  WEBENGINECORE RESOURCES
@@ -106,9 +111,7 @@ set(resourceList qtwebengine_resources.pak
     qtwebengine_resources_200p.pak
     qtwebengine_devtools_resources.pak)
 
-get_install_config(config)
-get_architectures(archs)
-list(GET archs 0 arch)
+
 
 foreach(loc ${localeList})
     get_filename_component(locSourcePath ${buildDir}/${config}/${arch}/qtwebengine_locales/${loc}.pak REALPATH)
diff --git a/src/core/api/Qt6WebEngineCoreMacros.cmake b/src/core/api/Qt6WebEngineCoreMacros.cmake
index efb34882b..7e23f377e 100644
--- a/src/core/api/Qt6WebEngineCoreMacros.cmake
+++ b/src/core/api/Qt6WebEngineCoreMacros.cmake
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 function(qt6_add_webengine_dictionary)
     set(options)
     set(oneValueArgs TARGET SOURCE OUTPUT_DIRECTORY)
diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake
index d712f1c2a..a35651b8b 100644
--- a/src/core/api/configure.cmake
+++ b/src/core/api/configure.cmake
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 #### Libraries
 
 if(NOT QT_CONFIGURE_RUNNING)
@@ -59,10 +62,6 @@ qt_feature("webengine-system-alsa" PRIVATE
     LABEL "Use ALSA"
     CONDITION UNIX AND TEST_alsa
 )
-qt_feature("webengine-v8-snapshot-support" PRIVATE
-    LABEL "Building v8 snapshot supported"
-    CONDITION NOT UNIX OR NOT QT_FEATURE_cross_compile OR ( TEST_architecture_arch STREQUAL arm64 ) OR TEST_webengine_host_compiler
-)
 qt_feature("webengine-geolocation" PUBLIC
     LABEL "Geolocation"
     CONDITION TARGET Qt::Positioning
@@ -147,6 +146,12 @@ qt_feature("webengine-sanitizer" PRIVATE
     AUTODETECT CLANG
     CONDITION CLANG AND ECM_ENABLE_SANITIZERS
 )
+qt_feature("webengine-vulkan" PRIVATE
+    SECTION "WebEngine"
+    LABEL "Vulkan support"
+    PURPOSE "Enables support for Vulkan rendering"
+    CONDITION QT_FEATURE_vulkan
+)
 # internal testing feature
 qt_feature("webengine-system-poppler" PRIVATE
     LABEL "popler"
@@ -175,8 +180,8 @@ qt_configure_add_summary_entry(
     CONDITION UNIX
 )
 qt_configure_add_summary_entry(
-    ARGS "webengine-v8-snapshot-support"
-    CONDITION UNIX AND cross_compile
+    ARGS "webengine-vulkan"
+    CONDITION QT_FEATURE_vulkan
 )
 qt_configure_add_summary_entry(
     ARGS "webengine-system-alsa"
@@ -200,11 +205,6 @@ if(CMAKE_CROSSCOMPILING)
 endif()
 qt_configure_add_report_entry(
     TYPE WARNING
-    MESSAGE "V8 snapshot cannot be built. Most likely, the 32-bit host compiler does not work. Please make sure you have 32-bit devel environment installed."
-    CONDITION UNIX AND cross_compile AND NOT QT_FEATURE_webengine_v8_snapshot_support
-)
-qt_configure_add_report_entry(
-    TYPE WARNING
     MESSAGE "WebRTC requires XDamage with qpa_xcb."
     CONDITION QT_FEATURE_webengine_ozone_x11 AND NOT XDAMAGE_FOUND
 )
diff --git a/src/core/api/qt_cmdline.cmake b/src/core/api/qt_cmdline.cmake
index 42dd6b240..fe7092b8c 100644
--- a/src/core/api/qt_cmdline.cmake
+++ b/src/core/api/qt_cmdline.cmake
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 qt_commandline_option(webengine-embedded-build TYPE boolean)
 qt_commandline_option(webengine-pepper-plugins TYPE boolean)
 qt_commandline_option(webengine-printing-and-pdf TYPE boolean)
diff --git a/src/core/api/qtwebenginecoreglobal.cpp b/src/core/api/qtwebenginecoreglobal.cpp
index 3c2eefdf5..2736e1a33 100644
--- a/src/core/api/qtwebenginecoreglobal.cpp
+++ b/src/core/api/qtwebenginecoreglobal.cpp
@@ -195,22 +195,25 @@ sandbox::SandboxInterfaceInfo *staticSandboxInterfaceInfo(sandbox::SandboxInterf
 static void initialize()
 {
 #if QT_CONFIG(opengl)
-  if (QCoreApplication::instance()) {
-    // On window/ANGLE, calling QtWebEngineQuick::initialize from DllMain will result in a crash.
-    if (!qt_gl_global_share_context() &&
-        !(QCoreApplication::testAttribute(Qt::AA_ShareOpenGLContexts) &&
-          QQuickWindow::graphicsApi() == QSGRendererInterface::OpenGLRhi)
-       ) {
-      qWarning("Qt WebEngine seems to be initialized from a plugin. Please "
-               "set Qt::AA_ShareOpenGLContexts using QCoreApplication::setAttribute and "
-               "QSGRendererInterface::OpenGLRhi using QQuickWindow::setGraphicsApi "
-               "before constructing QGuiApplication.");
+    if (QCoreApplication::instance()) {
+        // On Windows/ANGLE, calling QtWebEngineQuick::initialize from DllMain will result in a
+        // crash.
+        if (!qt_gl_global_share_context()
+            && !(QCoreApplication::testAttribute(Qt::AA_ShareOpenGLContexts)
+                 && QQuickWindow::graphicsApi() == QSGRendererInterface::OpenGLRhi)) {
+            qWarning("Qt WebEngine seems to be initialized from a plugin. Please "
+                     "set Qt::AA_ShareOpenGLContexts using QCoreApplication::setAttribute and "
+                     "QSGRendererInterface::OpenGLRhi using QQuickWindow::setGraphicsApi "
+                     "before constructing QGuiApplication.");
+        }
+        return;
     }
-    return;
-  }
-  // QCoreApplication is not yet instantiated, ensuring the call will be deferred
-  qAddPreRoutine(QtWebEngineCore::initialize);
-  QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
+
+    // QCoreApplication is not yet instantiated, ensuring the call will be deferred
+    qAddPreRoutine(QtWebEngineCore::initialize);
+    auto api = QQuickWindow::graphicsApi();
+    if (api != QSGRendererInterface::OpenGL && api != QSGRendererInterface::Vulkan)
+        QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
 #endif // QT_CONFIG(opengl)
 }
 
diff --git a/src/core/api/qtwebenginecoreglobal.h b/src/core/api/qtwebenginecoreglobal.h
index 305040808..3583e0848 100644
--- a/src/core/api/qtwebenginecoreglobal.h
+++ b/src/core/api/qtwebenginecoreglobal.h
@@ -18,6 +18,7 @@ QT_BEGIN_NAMESPACE
 #define ASSERT_ENUMS_MATCH(A, B) Q_STATIC_ASSERT_X(static_cast<int>(A) == static_cast<int>(B), "The enum values must match");
 
 Q_WEBENGINECORE_EXPORT Q_DECL_CONST_FUNCTION const char *qWebEngineVersion() noexcept;
+Q_WEBENGINECORE_EXPORT Q_DECL_CONST_FUNCTION const char *qWebEngineProcessName() noexcept;
 Q_WEBENGINECORE_EXPORT Q_DECL_CONST_FUNCTION const char *qWebEngineChromiumVersion() noexcept;
 Q_WEBENGINECORE_EXPORT Q_DECL_CONST_FUNCTION const char *qWebEngineChromiumSecurityPatchVersion() noexcept;
 
diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp
index 072b39650..dff2418b5 100644
--- a/src/core/api/qwebenginepage.cpp
+++ b/src/core/api/qwebenginepage.cpp
@@ -17,7 +17,6 @@
 #include "qwebenginenewwindowrequest_p.h"
 #include "qwebengineprofile.h"
 #include "qwebengineprofile_p.h"
-#include "qwebenginequotarequest.h"
 #include "qwebengineregisterprotocolhandlerrequest.h"
 #include "qwebenginescript.h"
 #include "qwebenginescriptcollection_p.h"
@@ -34,6 +33,7 @@
 #include "render_widget_host_view_qt_delegate.h"
 #include "render_widget_host_view_qt_delegate_client.h"
 #include "render_widget_host_view_qt_delegate_item.h"
+#include "touch_selection_menu_controller.h"
 #include "web_contents_adapter.h"
 
 #include <QAction>
@@ -502,12 +502,6 @@ void QWebEnginePagePrivate::runMouseLockPermissionRequest(const QUrl &securityOr
     Q_EMIT q->featurePermissionRequested(securityOrigin, QWebEnginePage::MouseLock);
 }
 
-void QWebEnginePagePrivate::runQuotaRequest(QWebEngineQuotaRequest request)
-{
-    Q_Q(QWebEnginePage);
-    Q_EMIT q->quotaRequested(request);
-}
-
 void QWebEnginePagePrivate::runRegisterProtocolHandlerRequest(QWebEngineRegisterProtocolHandlerRequest request)
 {
     Q_Q(QWebEnginePage);
@@ -742,12 +736,13 @@ QWebEnginePage::QWebEnginePage(QObject* parent)
 /*!
     \fn QWebEnginePage::quotaRequested(QWebEngineQuotaRequest quotaRequest)
     \since 5.11
+    \deprecated [6.5] This signal is no longer emitted.
 
-    This signal is emitted when the web page requests larger persistent storage
-    than the application's current allocation in File System API. The default quota
-    is 0 bytes.
+    Requesting host quota is no longer supported by Chromium.
+    The behavior of navigator.webkitPersistentStorage
+    is identical to navigator.webkitTemporaryStorage.
 
-    The request object \a quotaRequest can be used to accept or reject the request.
+    For further details, see https://crbug.com/1233525
 */
 
 /*!
@@ -1658,6 +1653,31 @@ void QWebEnginePagePrivate::printRequested()
         view->printRequested();
 }
 
+QtWebEngineCore::TouchHandleDrawableDelegate *
+QWebEnginePagePrivate::createTouchHandleDelegate(const QMap<int, QImage> &images)
+{
+    return view->createTouchHandleDelegate(images);
+}
+
+void QWebEnginePagePrivate::showTouchSelectionMenu(
+        QtWebEngineCore::TouchSelectionMenuController *controller, const QRect &selectionBounds,
+        const QSize &handleSize)
+{
+    Q_UNUSED(handleSize);
+
+    if (controller->buttonCount() == 1) {
+        controller->runContextMenu();
+        return;
+    }
+
+    view->showTouchSelectionMenu(controller, selectionBounds);
+}
+
+void QWebEnginePagePrivate::hideTouchSelectionMenu()
+{
+    view->hideTouchSelectionMenu();
+}
+
 void QWebEnginePagePrivate::lifecycleStateChanged(LifecycleState state)
 {
     Q_Q(QWebEnginePage);
@@ -1979,7 +1999,10 @@ void QWebEnginePage::runJavaScript(const QString& scriptSource, const std::funct
         return;
     }
     quint64 requestId = d->adapter->runJavaScriptCallbackResult(scriptSource, QWebEngineScript::MainWorld);
-    d->m_variantCallbacks.insert(requestId, resultCallback);
+    if (requestId)
+        d->m_variantCallbacks.insert(requestId, resultCallback);
+    else if (resultCallback)
+        resultCallback(QVariant());
 }
 
 void QWebEnginePage::runJavaScript(const QString& scriptSource, quint32 worldId, const std::function<void(const QVariant &)> &resultCallback)
@@ -1994,7 +2017,10 @@ void QWebEnginePage::runJavaScript(const QString& scriptSource, quint32 worldId,
     }
     if (resultCallback) {
         quint64 requestId = d->adapter->runJavaScriptCallbackResult(scriptSource, worldId);
-        d->m_variantCallbacks.insert(requestId, resultCallback);
+        if (requestId)
+            d->m_variantCallbacks.insert(requestId, resultCallback);
+        else
+            resultCallback(QVariant());
     } else {
         d->adapter->runJavaScript(scriptSource, worldId);
     }
@@ -2228,6 +2254,9 @@ QSizeF QWebEnginePage::contentsSize() const
     To be informed about the result of the request, connect to the signal
     pdfPrintingFinished().
 
+    \note The \l QWebEnginePage::Stop web action can be used to interrupt
+    this asynchronous operation.
+
     If a file already exists at the provided file path, it will be overwritten.
     \sa pdfPrintingFinished()
 */
@@ -2253,6 +2282,8 @@ void QWebEnginePage::printToPdf(const QString &filePath, const QPageLayout &layo
     The \a resultCallback must take a const reference to a QByteArray as parameter. If printing was successful, this byte array
     will contain the PDF data, otherwise, the byte array will be empty.
 
+    \note The \l QWebEnginePage::Stop web action can be used to interrupt this operation.
+
     \warning We guarantee that the callback (\a resultCallback) is always called, but it might be done
     during page destruction. When QWebEnginePage is deleted, the callback is triggered with an invalid
     value and it is not safe to use the corresponding QWebEnginePage or QWebEngineView instance inside it.
diff --git a/src/core/api/qwebenginepage.h b/src/core/api/qwebenginepage.h
index f4cca0582..c60feb3ab 100644
--- a/src/core/api/qwebenginepage.h
+++ b/src/core/api/qwebenginepage.h
@@ -7,6 +7,7 @@
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
 #include <QtWebEngineCore/qwebengineclientcertificateselection.h>
 #include <QtWebEngineCore/qwebenginedownloadrequest.h>
+#include <QtWebEngineCore/qwebenginequotarequest.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
@@ -35,7 +36,6 @@ class QWebEngineNavigationRequest;
 class QWebEngineNewWindowRequest;
 class QWebEnginePagePrivate;
 class QWebEngineProfile;
-class QWebEngineQuotaRequest;
 class QWebEngineRegisterProtocolHandlerRequest;
 class QWebEngineScriptCollection;
 class QWebEngineSettings;
@@ -309,7 +309,10 @@ Q_SIGNALS:
     void featurePermissionRequested(const QUrl &securityOrigin, QWebEnginePage::Feature feature);
     void featurePermissionRequestCanceled(const QUrl &securityOrigin, QWebEnginePage::Feature feature);
     void fullScreenRequested(QWebEngineFullScreenRequest fullScreenRequest);
+#if QT_DEPRECATED_SINCE(6, 5)
+    QT_DEPRECATED_VERSION_X_6_5("Requesting host quota is no longer supported.")
     void quotaRequested(QWebEngineQuotaRequest quotaRequest);
+#endif
     void registerProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request);
     void fileSystemAccessRequested(QWebEngineFileSystemAccessRequest request);
     void selectClientCertificate(QWebEngineClientCertificateSelection clientCertSelection);
diff --git a/src/core/api/qwebenginepage_p.h b/src/core/api/qwebenginepage_p.h
index 8bdf6de5c..bb33c7e98 100644
--- a/src/core/api/qwebenginepage_p.h
+++ b/src/core/api/qwebenginepage_p.h
@@ -77,6 +77,11 @@ public:
     virtual void showAutofillPopup(QtWebEngineCore::AutofillPopupController *controller,
                                    const QRect &bounds, bool autoselectFirstSuggestion) = 0;
     virtual void hideAutofillPopup() = 0;
+    virtual QtWebEngineCore::TouchHandleDrawableDelegate *
+    createTouchHandleDelegate(const QMap<int, QImage> &) = 0;
+    virtual void showTouchSelectionMenu(QtWebEngineCore::TouchSelectionMenuController *,
+                                        const QRect &) = 0;
+    virtual void hideTouchSelectionMenu() = 0;
 };
 
 class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEnginePagePrivate : public QtWebEngineCore::WebContentsAdapterClient
@@ -138,7 +143,6 @@ public:
     void runMediaAccessPermissionRequest(const QUrl &securityOrigin, MediaRequestFlags requestFlags) override;
     void runFeaturePermissionRequest(QtWebEngineCore::ProfileAdapter::PermissionType permission, const QUrl &securityOrigin) override;
     void runMouseLockPermissionRequest(const QUrl &securityOrigin) override;
-    void runQuotaRequest(QWebEngineQuotaRequest) override;
     void runRegisterProtocolHandlerRequest(QWebEngineRegisterProtocolHandlerRequest) override;
     void runFileSystemAccessRequest(QWebEngineFileSystemAccessRequest) override;
     QObject *accessibilityParentObject() override;
@@ -157,9 +161,10 @@ public:
     void setToolTip(const QString &toolTipText) override;
     void printRequested() override;
     QtWebEngineCore::TouchHandleDrawableDelegate *
-    createTouchHandleDelegate(const QMap<int, QImage> &) override { return nullptr; }
-    void showTouchSelectionMenu(QtWebEngineCore::TouchSelectionMenuController *, const QRect &, const QSize &) override { }
-    void hideTouchSelectionMenu() override { }
+    createTouchHandleDelegate(const QMap<int, QImage> &) override;
+    void showTouchSelectionMenu(QtWebEngineCore::TouchSelectionMenuController *, const QRect &,
+                                const QSize &) override;
+    void hideTouchSelectionMenu() override;
     const QObject *holdingQObject() const override;
     ClientType clientType() override { return QtWebEngineCore::WebContentsAdapterClient::WidgetsClient; }
     void findTextFinished(const QWebEngineFindTextResult &result) override;
@@ -195,7 +200,6 @@ public:
     QWebChannel *webChannel;
     unsigned int webChannelWorldId;
     QUrl iconUrl;
-    bool m_navigationActionTriggered;
     QPointer<QWebEnginePage> inspectedPage;
     QPointer<QWebEnginePage> devToolsPage;
     bool defaultAudioMuted;
diff --git a/src/core/api/qwebengineprofile.cpp b/src/core/api/qwebengineprofile.cpp
index 445df4b52..ab873e345 100644
--- a/src/core/api/qwebengineprofile.cpp
+++ b/src/core/api/qwebengineprofile.cpp
@@ -393,6 +393,37 @@ void QWebEngineProfile::setDownloadPath(const QString &path)
 }
 
 /*!
+    \since 6.5
+
+    Returns \c true if the push messaging service is enabled.
+    \note By default the push messaging service is disabled.
+
+    \sa setPushServiceEnabled()
+*/
+bool QWebEngineProfile::isPushServiceEnabled() const
+{
+    const Q_D(QWebEngineProfile);
+    return d->profileAdapter()->pushServiceEnabled();
+}
+
+/*!
+    \since 6.5
+
+    Enables the push messaging service if \a enable is \c true, otherwise disables it.
+
+    \note \QWE uses \l {https://firebase.google.com}{Firebase Cloud Messaging (FCM)}
+    as a browser push service. Therefore, all push messages will go through the
+    Google push service and its respective servers.
+
+    \sa isPushServiceEnabled()
+*/
+void QWebEngineProfile::setPushServiceEnabled(bool enable)
+{
+    Q_D(QWebEngineProfile);
+    d->profileAdapter()->setPushServiceEnabled(enable);
+}
+
+/*!
     Returns the path used for caches.
 
     By default, this is below StandardPaths::CacheLocation in a QtWebengine/StorageName specific
diff --git a/src/core/api/qwebengineprofile.h b/src/core/api/qwebengineprofile.h
index c29202973..9fb4c8e74 100644
--- a/src/core/api/qwebengineprofile.h
+++ b/src/core/api/qwebengineprofile.h
@@ -98,6 +98,9 @@ public:
     QString downloadPath() const;
     void setDownloadPath(const QString &path);
 
+    bool isPushServiceEnabled() const;
+    void setPushServiceEnabled(bool enabled);
+
     void setNotificationPresenter(std::function<void(std::unique_ptr<QWebEngineNotification>)> notificationPresenter);
 
     QWebEngineClientCertificateStore *clientCertificateStore();
diff --git a/src/core/api/qwebenginequotarequest.cpp b/src/core/api/qwebenginequotarequest.cpp
index ca1289625..3c312216d 100644
--- a/src/core/api/qwebenginequotarequest.cpp
+++ b/src/core/api/qwebenginequotarequest.cpp
@@ -3,76 +3,54 @@
 
 #include "qwebenginequotarequest.h"
 
-#include "quota_request_controller.h"
+#if QT_DEPRECATED_SINCE(6, 5)
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \class QWebEngineQuotaRequest
-    \brief The QWebEngineQuotaRequest class enables accepting or rejecting
-    requests for larger persistent storage than the application's current
-    allocation in File System API.
-
     \since 5.11
     \inmodule QtWebEngineCore
+    \deprecated [6.5] Requesting host quota is no longer supported by Chromium.
+
+    The behavior of navigator.webkitPersistentStorage
+    is identical to navigator.webkitTemporaryStorage.
 
-    This class is used by the QWebEnginePage::quotaRequested() signal to \l
-    accept() or \l reject() a request for an increase in the persistent storage
-    allocated to the application. The default quota is 0 bytes.
+    For further details, see https://crbug.com/1233525
 */
 
 /*! \fn QWebEngineQuotaRequest::QWebEngineQuotaRequest()
     \internal
 */
 
-/*! \internal */
-QWebEngineQuotaRequest::QWebEngineQuotaRequest(QSharedPointer<QtWebEngineCore::QuotaRequestController> controller)
-    : d_ptr(controller)
-{}
-
-/*!
-    Rejects a request for larger persistent storage.
-*/
 void QWebEngineQuotaRequest::reject()
 {
-    d_ptr->reject();
 }
 
-/*!
-    Accepts a request for larger persistent storage.
-*/
 void QWebEngineQuotaRequest::accept()
 {
-    d_ptr->accept();
 }
 
 /*!
     \property QWebEngineQuotaRequest::origin
-    \brief The URL of the web page that issued the quota request.
 */
 
 QUrl QWebEngineQuotaRequest::origin() const
 {
-    return d_ptr->origin();
+    return QUrl();
 }
 
 /*!
     \property QWebEngineQuotaRequest::requestedSize
-    \brief Contains the size of the requested disk space in bytes.
 */
 
 qint64 QWebEngineQuotaRequest::requestedSize() const
 {
-    return d_ptr->requestedSize();
+    return 0;
 }
 
-/*! \fn bool QWebEngineQuotaRequest::operator==(const QWebEngineQuotaRequest &that) const
-    Returns \c true if \a that points to the same object as this quota request.
-*/
+QT_END_NAMESPACE
 
-/*! \fn bool QWebEngineQuotaRequest::operator!=(const QWebEngineQuotaRequest &that) const
-    Returns \c true if \a that points to a different object than this request.
-*/
+#endif // QT_DEPRECATED_SINCE(6, 5)
 
-QT_END_NAMESPACE
 #include "moc_qwebenginequotarequest.cpp"
diff --git a/src/core/api/qwebenginequotarequest.h b/src/core/api/qwebenginequotarequest.h
index c10789360..f542f5576 100644
--- a/src/core/api/qwebenginequotarequest.h
+++ b/src/core/api/qwebenginequotarequest.h
@@ -6,13 +6,9 @@
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
-#include <QtCore/qsharedpointer.h>
 #include <QtCore/qurl.h>
 
-namespace QtWebEngineCore {
-class QuotaPermissionContextQt;
-class QuotaRequestController;
-} // namespace QtWebEngineCore
+#if QT_DEPRECATED_SINCE(6, 5)
 
 QT_BEGIN_NAMESPACE
 
@@ -22,20 +18,18 @@ class Q_WEBENGINECORE_EXPORT QWebEngineQuotaRequest
     Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL)
     Q_PROPERTY(qint64 requestedSize READ requestedSize CONSTANT FINAL)
 public:
+    QT_DEPRECATED_VERSION_X_6_5("Requesting host quota is no longer supported.")
     QWebEngineQuotaRequest() {}
     Q_INVOKABLE void accept();
     Q_INVOKABLE void reject();
     QUrl origin() const;
     qint64 requestedSize() const;
-    bool operator==(const QWebEngineQuotaRequest &that) const { return d_ptr == that.d_ptr; }
-    bool operator!=(const QWebEngineQuotaRequest &that) const { return d_ptr != that.d_ptr; }
-
-private:
-    QWebEngineQuotaRequest(QSharedPointer<QtWebEngineCore::QuotaRequestController>);
-    friend QtWebEngineCore::QuotaPermissionContextQt;
-    QSharedPointer<QtWebEngineCore::QuotaRequestController> d_ptr;
+    bool operator==(const QWebEngineQuotaRequest &) const { Q_UNREACHABLE(); }
+    bool operator!=(const QWebEngineQuotaRequest &) const { Q_UNREACHABLE(); }
 };
 
 QT_END_NAMESPACE
 
+#endif // QT_DEPRECATED_SINCE(6, 5)
+
 #endif // QWEBENGINEQUOTAREQUEST_H
diff --git a/src/core/api/qwebengineurlrequestinfo.cpp b/src/core/api/qwebengineurlrequestinfo.cpp
index 716f53e73..162ae7daf 100644
--- a/src/core/api/qwebengineurlrequestinfo.cpp
+++ b/src/core/api/qwebengineurlrequestinfo.cpp
@@ -76,10 +76,10 @@ ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::RedirectNavigation
     execution of this function is finished.
 */
 
-QWebEngineUrlRequestInfoPrivate::QWebEngineUrlRequestInfoPrivate(QWebEngineUrlRequestInfo::ResourceType resource,
-                                                                 QWebEngineUrlRequestInfo::NavigationType navigation,
-                                                                 const QUrl &u, const QUrl &fpu, const QUrl &i,
-                                                                 const QByteArray &m)
+QWebEngineUrlRequestInfoPrivate::QWebEngineUrlRequestInfoPrivate(
+        QWebEngineUrlRequestInfo::ResourceType resource,
+        QWebEngineUrlRequestInfo::NavigationType navigation, const QUrl &u, const QUrl &fpu,
+        const QUrl &i, const QByteArray &m, const QHash<QByteArray, QByteArray> &h)
     : resourceType(resource)
     , navigationType(navigation)
     , shouldBlockRequest(false)
@@ -89,6 +89,7 @@ QWebEngineUrlRequestInfoPrivate::QWebEngineUrlRequestInfoPrivate(QWebEngineUrlRe
     , initiator(i)
     , method(m)
     , changed(false)
+    , extraHeaders(h)
 {}
 
 /*!
@@ -285,7 +286,28 @@ void QWebEngineUrlRequestInfo::block(bool shouldBlock)
 void QWebEngineUrlRequestInfo::setHttpHeader(const QByteArray &name, const QByteArray &value)
 {
     d_ptr->changed = true;
+
+    // Headers are case insentive, so we need to compare manually
+    for (auto it = d_ptr->extraHeaders.begin(); it != d_ptr->extraHeaders.end(); ++it) {
+        if (it.key().compare(name, Qt::CaseInsensitive) == 0) {
+            d_ptr->extraHeaders.erase(it);
+            break;
+        }
+    }
+
     d_ptr->extraHeaders.insert(name, value);
 }
 
+/*!
+    Returns the request headers.
+    \since 6.5
+    \note Not all headers are visible at this stage as Chromium will add
+    security and proxy headers at a later stage.
+*/
+
+QHash<QByteArray, QByteArray> QWebEngineUrlRequestInfo::httpHeaders() const
+{
+    return d_ptr->extraHeaders;
+}
+
 QT_END_NAMESPACE
diff --git a/src/core/api/qwebengineurlrequestinfo.h b/src/core/api/qwebengineurlrequestinfo.h
index 5d27bcb7a..3678b52f4 100644
--- a/src/core/api/qwebengineurlrequestinfo.h
+++ b/src/core/api/qwebengineurlrequestinfo.h
@@ -73,6 +73,7 @@ public:
     void block(bool shouldBlock);
     void redirect(const QUrl &url);
     void setHttpHeader(const QByteArray &name, const QByteArray &value);
+    QHash<QByteArray, QByteArray> httpHeaders() const;
 
 private:
     friend class QtWebEngineCore::ContentBrowserClientQt;
diff --git a/src/core/api/qwebengineurlrequestinfo_p.h b/src/core/api/qwebengineurlrequestinfo_p.h
index ec9cdda69..08faf8323 100644
--- a/src/core/api/qwebengineurlrequestinfo_p.h
+++ b/src/core/api/qwebengineurlrequestinfo_p.h
@@ -34,8 +34,10 @@ class QWebEngineUrlRequestInfoPrivate
     Q_DECLARE_PUBLIC(QWebEngineUrlRequestInfo)
 public:
     QWebEngineUrlRequestInfoPrivate(QWebEngineUrlRequestInfo::ResourceType resource,
-                                    QWebEngineUrlRequestInfo::NavigationType navigation, const QUrl &u, const QUrl &fpu,
-                                    const QUrl &i, const QByteArray &m);
+                                    QWebEngineUrlRequestInfo::NavigationType navigation,
+                                    const QUrl &u, const QUrl &fpu, const QUrl &i,
+                                    const QByteArray &m,
+                                    const QHash<QByteArray, QByteArray> &h = {});
 
     QWebEngineUrlRequestInfo::ResourceType resourceType;
     QWebEngineUrlRequestInfo::NavigationType navigationType;
diff --git a/src/core/api/qwebengineurlschemehandler.cpp b/src/core/api/qwebengineurlschemehandler.cpp
index e78a206d6..e01ecef49 100644
--- a/src/core/api/qwebengineurlschemehandler.cpp
+++ b/src/core/api/qwebengineurlschemehandler.cpp
@@ -12,9 +12,23 @@ QT_BEGIN_NAMESPACE
     \brief The QWebEngineUrlSchemeHandler class is a base class for handling custom URL schemes.
     \since 5.6
 
+    A custom scheme handler is, broadly speaking, similar to a web application
+    served over HTTP. However, because custom schemes are integrated directly
+    into the web engine, they have the advantage in terms of efficiency and security:
+    There is no need for generating and parsing HTTP messages or for transferring data
+    over sockets, nor any way to intercept or monitor the traffic.
+
     To implement a custom URL scheme for QtWebEngine, you first have to create an instance of
     QWebEngineUrlScheme and register it using QWebEngineUrlScheme::registerScheme().
 
+    As custom schemes are integrated directly into the web engine, they do not
+    necessarily need to follow the standard security rules which apply to
+    ordinary web content. Depending on the chosen configuration, content served
+    over a custom scheme may be given access to local resources, be set to
+    ignore Content-Security-Policy rules, or conversely, be denied access to any
+    other content entirely. If it is to be accessed by normal content, ensure cross-origin
+    access is enabled, and if accessed from HTTPS that it is marked as secure.
+
     \note Make sure that you create and register the scheme object \e before the QGuiApplication
     or QApplication object is instantiated.
 
@@ -30,10 +44,23 @@ QT_BEGIN_NAMESPACE
     {
     public:
         MySchemeHandler(QObject *parent = nullptr);
-        void requestStarted(QWebEngineUrlRequestJob *request)
+        void requestStarted(QWebEngineUrlRequestJob *job)
         {
-            // ....
+            const QByteArray method = job->requestMethod();
+            const QUrl url = job->requestUrl();
+
+            if (isValidUrl(url)) {
+                if (method == QByteArrayLiteral("GET")) {
+                    job->reply(QByteArrayLiteral("text/html"), makeReply(url));
+                else // Unsupported method
+                    job->fail(QWebEngineUrlRequestJob::RequestDenied);
+            } else {
+                // Invalid URL
+                job->fail(QWebEngineUrlRequestJob::UrlNotFound);
+            }
         }
+        bool isValidUrl(const QUrl &url) const // ....
+        QIODevice *makeReply(const QUrl &url) // ....
     };
 
     int main(int argc, char **argv)
@@ -56,7 +83,7 @@ QT_BEGIN_NAMESPACE
 
     \inmodule QtWebEngineCore
 
-    \sa {QWebEngineUrlScheme}, {WebEngine Widgets WebUI Example}
+    \sa {QWebEngineUrlScheme}
 */
 
 /*!
author	Tarja Sundqvist <tarja.sundqvist@qt.io>	2024-06-11 13:21:32 +0300
committer	Tarja Sundqvist <tarja.sundqvist@qt.io>	2024-06-11 13:31:01 +0300
commit	3cd4e0aa7961889eb06374885ed648f5b9bd85bc (patch)
tree	6a089aedea155b1f1a74b553f4d1b57c70554a8f /src/core/api
parent	6d029165d1593c514db08c34d6b08a00a4435d5e (diff)
parent	38063a6332b9f948a0381763271e9a9ac7af0999 (diff)