diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/web_contents_adapter.cpp | 10 | ||||
-rw-r--r-- | src/core/web_contents_adapter.h | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 3ea5e416b..ffb31ce8a 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -610,21 +610,23 @@ void WebContentsAdapter::enableInspector(bool enable) ContentBrowserClientQt::Get()->enableInspector(enable); } -void WebContentsAdapter::runJavaScript(const QString &javaScript, const QString &xPath) +void WebContentsAdapter::runJavaScript(const QString &javaScript) { Q_D(WebContentsAdapter); content::RenderViewHost *rvh = d->webContents->GetRenderViewHost(); Q_ASSERT(rvh); - rvh->ExecuteJavascriptInWebFrame(toString16(xPath), toString16(javaScript)); + base::string16 mainFrameXPath; + rvh->ExecuteJavascriptInWebFrame(mainFrameXPath, toString16(javaScript)); } -quint64 WebContentsAdapter::runJavaScriptCallbackResult(const QString &javaScript, const QString &xPath) +quint64 WebContentsAdapter::runJavaScriptCallbackResult(const QString &javaScript) { Q_D(WebContentsAdapter); content::RenderViewHost *rvh = d->webContents->GetRenderViewHost(); Q_ASSERT(rvh); content::RenderViewHost::JavascriptResultCallback callback = base::Bind(&callbackOnEvaluateJS, d->adapterClient, ++d->lastRequestId); - rvh->ExecuteJavascriptInWebFrameCallbackResult(toString16(xPath), toString16(javaScript), callback); + base::string16 mainFrameXPath; + rvh->ExecuteJavascriptInWebFrameCallbackResult(mainFrameXPath, toString16(javaScript), callback); return d->lastRequestId; } diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h index 371be5d9d..d327de048 100644 --- a/src/core/web_contents_adapter.h +++ b/src/core/web_contents_adapter.h @@ -97,8 +97,8 @@ public: qreal currentZoomFactor() const; void enableInspector(bool); void filesSelectedInChooser(const QStringList &fileList, WebContentsAdapterClient::FileChooserMode); - void runJavaScript(const QString &javaScript, const QString &xPath); - quint64 runJavaScriptCallbackResult(const QString &javaScript, const QString &xPath); + void runJavaScript(const QString &javaScript); + quint64 runJavaScriptCallbackResult(const QString &javaScript); quint64 fetchDocumentMarkup(); quint64 fetchDocumentInnerText(); quint64 findText(const QString &subString, bool caseSensitively, bool findBackward); |