summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-02-03 16:27:01 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-12 17:13:35 +0100
commitf5f5a86c7e9bb2196d345d9cb4684b6529d81184 (patch)
treefb5caef053deb97b59cfd8b9ddfba9be997bba5f /src
parentbf65a7dcad419ed8d7e504a3ceece56cd7afa1e4 (diff)
Implement QWebEnginePage::requestedUrl
Change-Id: I6accd8fd40ad72041770439aa6a7aa59ba904418 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/web_contents_adapter.cpp11
-rw-r--r--src/core/web_contents_adapter.h1
-rw-r--r--src/webenginewidgets/api/qwebenginepage.cpp6
3 files changed, 18 insertions, 0 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index d67edbe7a..af141b5dd 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -301,6 +301,17 @@ QUrl WebContentsAdapter::activeUrl() const
return toQt(d->webContents->GetVisibleURL());
}
+QUrl WebContentsAdapter::requestedUrl() const
+{
+ Q_D(const WebContentsAdapter);
+ if (content::NavigationEntry* entry = d->webContents->GetController().GetVisibleEntry()) {
+ if (!entry->GetOriginalRequestURL().is_empty())
+ return toQt(entry->GetOriginalRequestURL());
+ return toQt(entry->GetURL());
+ }
+ return QUrl();
+}
+
QString WebContentsAdapter::pageTitle() const
{
Q_D(const WebContentsAdapter);
diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h
index 2079c89b1..93027c19c 100644
--- a/src/core/web_contents_adapter.h
+++ b/src/core/web_contents_adapter.h
@@ -69,6 +69,7 @@ public:
void load(const QUrl&);
void setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl, const QUrl &unreachableUrl);
QUrl activeUrl() const;
+ QUrl requestedUrl() const;
QString pageTitle() const;
void navigateToIndex(int);
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 11cb7dbc5..0f414f313 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -548,6 +548,12 @@ QUrl QWebEnginePage::url() const
return d->adapter->activeUrl();
}
+QUrl QWebEnginePage::requestedUrl() const
+{
+ Q_D(const QWebEnginePage);
+ return d->adapter->requestedUrl();
+}
+
void QWebEnginePage::render(QPainter *p, const QRegion &clip)
{
Q_D(const QWebEnginePage);