diff options
author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2014-08-28 05:31:03 -0700 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-28 19:06:38 +0200 |
commit | 530ab16146b18457d0b3395ea64a6de756a4d22d (patch) | |
tree | d85db701e861f58850d7717e54ea14249f3ca612 /src/core | |
parent | ad11d3d25bd8a52a1b36cb3210546562382b64c5 (diff) |
Fix callback mechanism in the WebContentsAdapter
When we dispatch a request, we register it's callback with
different ID in the QWebEnginePagePrivate.
Change-Id: I1fa1f778de66fbedbd6cce35f6c823d5640dbe5e
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/web_contents_adapter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 143295ce0..e221e0ce8 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -647,23 +647,23 @@ quint64 WebContentsAdapter::runJavaScriptCallbackResult(const QString &javaScrip Q_D(WebContentsAdapter); content::RenderViewHost *rvh = d->webContents->GetRenderViewHost(); Q_ASSERT(rvh); - content::RenderFrameHost::JavaScriptResultCallback callback = base::Bind(&callbackOnEvaluateJS, d->adapterClient, d->nextRequestId++); + content::RenderFrameHost::JavaScriptResultCallback callback = base::Bind(&callbackOnEvaluateJS, d->adapterClient, d->nextRequestId); rvh->GetMainFrame()->ExecuteJavaScript(toString16(javaScript), callback); - return d->nextRequestId; + return d->nextRequestId++; } quint64 WebContentsAdapter::fetchDocumentMarkup() { Q_D(WebContentsAdapter); - d->renderViewObserverHost->fetchDocumentMarkup(d->nextRequestId++); - return d->nextRequestId; + d->renderViewObserverHost->fetchDocumentMarkup(d->nextRequestId); + return d->nextRequestId++; } quint64 WebContentsAdapter::fetchDocumentInnerText() { Q_D(WebContentsAdapter); - d->renderViewObserverHost->fetchDocumentInnerText(d->nextRequestId++); - return d->nextRequestId; + d->renderViewObserverHost->fetchDocumentInnerText(d->nextRequestId); + return d->nextRequestId++; } quint64 WebContentsAdapter::findText(const QString &subString, bool caseSensitively, bool findBackward) |