diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2014-05-06 02:04:08 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-08 15:31:02 +0200 |
| commit | 9648528ad6fbd66eeaae3189173a7d7b47b935ce (patch) | |
| tree | 8d420f17d0be7077517e5e257adfe98773ab41f3 /src/core | |
| parent | 388a71d66f31df999dc9259d4eb156c497ad5247 (diff) | |
Add test_baseUrlAfterLoadHtml QML test case
Remove unreachableUrl support from WebContentsAdapter::setContent,
because this argument behaves exactly the same as baseUrl.
Change-Id: I36f92b99b7045c6d3b831481bb04d51a0e05772f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/web_contents_adapter.cpp | 4 | ||||
| -rw-r--r-- | src/core/web_contents_adapter.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 11b5f7cc2..3ea5e416b 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -438,7 +438,7 @@ void WebContentsAdapter::load(const QUrl &url) d->webContents->GetView()->Focus(); } -void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl, const QUrl &unreachableUrl) +void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl) { Q_D(WebContentsAdapter); QByteArray encodedData = data.toPercentEncoding(); @@ -450,7 +450,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.virtual_url_for_data_url = baseUrl.isEmpty() ? GURL(content::kAboutBlankURL) : toGurl(baseUrl); params.can_load_local_resources = true; d->webContents->GetController().LoadURLWithParams(params); } diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h index b6984933e..371be5d9d 100644 --- a/src/core/web_contents_adapter.h +++ b/src/core/web_contents_adapter.h @@ -69,7 +69,7 @@ public: void stop(); void reload(); void load(const QUrl&); - void setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl, const QUrl &unreachableUrl); + void setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl); QUrl activeUrl() const; QUrl requestedUrl() const; QString pageTitle() const; |