From 530ab16146b18457d0b3395ea64a6de756a4d22d Mon Sep 17 00:00:00 2001
From: Szabolcs David <davidsz@inf.u-szeged.hu>
Date: Thu, 28 Aug 2014 05:31:03 -0700
Subject: [PATCH] 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>
---
src/core/web_contents_adapter.cpp | 12 ++++++------
1 file 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)
--
GitLab