diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-01-15 18:22:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-22 08:45:09 +0100 |
| commit | 6d760436bc0d7081d5bdb50e4141171b6ba940ee (patch) | |
| tree | 9f17b8122a09b89a818373d9a269072d984ca0a6 /src/core/web_contents_adapter_client.h | |
| parent | e6b846f3800eed35d31a45122f7f8c3215dc38ef (diff) | |
Refactor the callback mechanism used by runJavaScript
This prepares the way for other API made async like toHtml and
toPlainText.
Use a callback class with an implicit templated constructor to carry
the functor across the API boundary and avoid the intermediate helper
method as the ABI that we have to maintain.
Also pass the callback result through WebContentsAdapterClient using
a bookkeeping ID instead of transferring the callback to
WebContentsAdapter. This will allow other calls, which might not
already allow passing a callback functor, to use a consisten way
of carrying back the result to the top API layer.
Change-Id: Ia923767b9c1021a108c26da17d4c41878ef7cb95
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src/core/web_contents_adapter_client.h')
| -rw-r--r-- | src/core/web_contents_adapter_client.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h index 28cd3c4d8..e3e88e110 100644 --- a/src/core/web_contents_adapter_client.h +++ b/src/core/web_contents_adapter_client.h @@ -49,6 +49,8 @@ #include <QStringList> #include <QUrl> +QT_FORWARD_DECLARE_CLASS(QVariant) + class JavaScriptDialogController; class RenderWidgetHostViewQt; class RenderWidgetHostViewQtDelegate; @@ -127,6 +129,7 @@ public: virtual bool contextMenuRequested(const WebEngineContextMenuData&) = 0; virtual void javascriptDialog(QSharedPointer<JavaScriptDialogController>) = 0; virtual void runFileChooser(FileChooserMode, const QString &defaultFileName, const QStringList &acceptedMimeTypes) = 0; + virtual void didRunJavaScript(const QVariant& result, quint64 requestId) = 0; }; #endif // WEB_CONTENTS_ADAPTER_CLIENT_H |