diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2014-02-05 08:40:38 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-11 19:31:25 +0100 |
| commit | f2cd2e0a32e8da3a0fbff6271dd9c257d8e8867f (patch) | |
| tree | 191ffa3d55e4edbd7a1dce46a17328b4997830a0 /src/core/web_contents_adapter.cpp | |
| parent | 45e3f34fba7f499d58352951d8e8777c47c229d2 (diff) | |
Implement loadHtml function for QQuickWebEngineView
Implement unreachableUrl support for WebContentsAdapter::setContent
and add loadProgressAfterLoadHtml QML test case.
Change-Id: I2d0d7834cbbf8f508de4fa9cb72240f2ac6ebf83
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/web_contents_adapter.cpp')
| -rw-r--r-- | src/core/web_contents_adapter.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 9f4768e12..6325a380f 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -57,6 +57,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/common/page_zoom.h" #include "content/public/common/renderer_preferences.h" +#include "content/public/common/url_constants.h" #include "ui/shell_dialogs/selected_file_info.h" #include <QDir> @@ -283,7 +284,7 @@ void WebContentsAdapter::load(const QUrl &url) d->webContents->GetView()->Focus(); } -void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl) +void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl, const QUrl &unreachableUrl) { Q_D(WebContentsAdapter); QByteArray encodedData = data.toPercentEncoding(); @@ -295,6 +296,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT content::NavigationController::LoadURLParams params((GURL(urlString))); params.load_type = content::NavigationController::LOAD_TYPE_DATA; params.base_url_for_data_url = toGurl(baseUrl); + params.virtual_url_for_data_url = unreachableUrl.isEmpty() ? GURL(content::kAboutBlankURL) : toGurl(unreachableUrl); params.can_load_local_resources = true; d->webContents->GetController().LoadURLWithParams(params); } |