diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-12 15:20:50 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-14 19:03:10 +0000 |
| commit | 528d50ffa3de01c4a3e62000bd5d44dd4b817949 (patch) | |
| tree | 95ddf5ec9399d6320079dc2bbf2c400933914567 /src | |
| parent | 58c67b08f7ad668f95a6edaccd96dd0fe72f675d (diff) | |
Remove one more redundant function definition
Change-Id: I45bb1ab74fd15cae9c84262f3887c2ebbef23c3b
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
(cherry picked from commit e1c78f2dc37c94873855fdb5f45426ed6e669334)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/api/qwebenginepage.cpp | 19 | ||||
| -rw-r--r-- | src/core/api/qwebenginepage.h | 3 | ||||
| -rw-r--r-- | src/core/doc/src/qwebenginepage_lgpl.qdoc | 3 |
3 files changed, 8 insertions, 17 deletions
diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp index 973826efb..131210fbc 100644 --- a/src/core/api/qwebenginepage.cpp +++ b/src/core/api/qwebenginepage.cpp @@ -2015,17 +2015,6 @@ void QWebEnginePage::runJavaScript(const QString& scriptSource, const std::funct d->m_variantCallbacks.insert(requestId, resultCallback); } -void QWebEnginePage::runJavaScript(const QString &scriptSource, quint32 worldId) -{ - Q_D(QWebEnginePage); - d->ensureInitialized(); - if (d->adapter->lifecycleState() == WebContentsAdapter::LifecycleState::Discarded) { - qWarning("runJavaScript: disabled in Discarded state"); - return; - } - d->adapter->runJavaScript(scriptSource, worldId); -} - void QWebEnginePage::runJavaScript(const QString& scriptSource, quint32 worldId, const std::function<void(const QVariant &)> &resultCallback) { Q_D(QWebEnginePage); @@ -2036,8 +2025,12 @@ void QWebEnginePage::runJavaScript(const QString& scriptSource, quint32 worldId, resultCallback(QVariant()); return; } - quint64 requestId = d->adapter->runJavaScriptCallbackResult(scriptSource, worldId); - d->m_variantCallbacks.insert(requestId, resultCallback); + if (resultCallback) { + quint64 requestId = d->adapter->runJavaScriptCallbackResult(scriptSource, worldId); + d->m_variantCallbacks.insert(requestId, resultCallback); + } else { + d->adapter->runJavaScript(scriptSource, worldId); + } } /*! diff --git a/src/core/api/qwebenginepage.h b/src/core/api/qwebenginepage.h index 73b1bfd3a..4f99d0107 100644 --- a/src/core/api/qwebenginepage.h +++ b/src/core/api/qwebenginepage.h @@ -283,9 +283,8 @@ public: QPointF scrollPosition() const; QSizeF contentsSize() const; - void runJavaScript(const QString &scriptSource, quint32 worldId = 0); void runJavaScript(const QString &scriptSource, const std::function<void(const QVariant &)> &resultCallback); - void runJavaScript(const QString &scriptSource, quint32 worldId, const std::function<void(const QVariant &)> &resultCallback); + void runJavaScript(const QString &scriptSource, quint32 worldId = 0, const std::function<void(const QVariant &)> &resultCallback = {}); QWebEngineScriptCollection &scripts(); QWebEngineSettings *settings() const; diff --git a/src/core/doc/src/qwebenginepage_lgpl.qdoc b/src/core/doc/src/qwebenginepage_lgpl.qdoc index d250e0356..43195deb2 100644 --- a/src/core/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/core/doc/src/qwebenginepage_lgpl.qdoc @@ -740,8 +740,7 @@ */ /*! - \fn void QWebEnginePage::runJavaScript(const QString &scriptSource, quint32 worldId, const std::function<void(const QVariant &)> &resultCallback) - \fn void QWebEnginePage::runJavaScript(const QString &scriptSource, quint32 worldId = 0) + \fn void QWebEnginePage::runJavaScript(const QString &scriptSource, quint32 worldId = 0, const std::function<void(const QVariant &)> &resultCallback = {}) \fn void QWebEnginePage::runJavaScript(const QString &scriptSource, const std::function<void(const QVariant &)> &resultCallback) \since 5.7 |