diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-01-15 19:10:22 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-22 08:45:25 +0100 |
commit | 1fcd7970e07a0ecab206224824d1c71488fc19e9 (patch) | |
tree | 7bc6ba73623a69aa303f1f4d5c075e8ef37ca45e /src/core/web_contents_adapter.cpp | |
parent | 3fcd31f5bd86cb568b1ca4f4f5c7c12c6675dceb (diff) |
Implement QWebEnginePage::toHtml and toPlainText
Those methods are now made asynchronous and need to be given a
callback to handle the result.
Update the code in the browser and fancybrowser examples using
std::bind when using C++11 or tr1::bind with C++03 (which should be
available with compilers on platforms that we support).
Add a (currently failing) earlyToHtml test to make sure that an empty
page doesn't crash because of a possibly incomplete attachment of
the QtRenderViewObserver.
Change-Id: I3ab7cb6f25b91b584dd80df5e4e9ad1e3214348e
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src/core/web_contents_adapter.cpp')
-rw-r--r-- | src/core/web_contents_adapter.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index bd3be1744..6cdc83375 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -394,6 +394,20 @@ quint64 WebContentsAdapter::runJavaScriptCallbackResult(const QString &javaScrip return d->lastRequestId; } +quint64 WebContentsAdapter::fetchDocumentMarkup() +{ + Q_D(WebContentsAdapter); + d->renderViewObserverHost->fetchDocumentMarkup(++d->lastRequestId); + return d->lastRequestId; +} + +quint64 WebContentsAdapter::fetchDocumentInnerText() +{ + Q_D(WebContentsAdapter); + d->renderViewObserverHost->fetchDocumentInnerText(++d->lastRequestId); + return d->lastRequestId; +} + void WebContentsAdapter::dpiScaleChanged() { Q_D(WebContentsAdapter); |