From d168efae9ea5c34fea39590cb9568d956faa3810 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Tue, 21 Jun 2016 21:45:24 +0200
Subject: [PATCH] WebHitTestResult: Use baseURI for resolving link url

Fixes resolving link urls when there is set base href.

Closes #2010
---
 src/lib/webengine/webhittestresult.cpp | 12 +++++++++---
 src/lib/webengine/webhittestresult.h   |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/lib/webengine/webhittestresult.cpp b/src/lib/webengine/webhittestresult.cpp
index 285803c74..c7a3b3c08 100644
--- a/src/lib/webengine/webhittestresult.cpp
+++ b/src/lib/webengine/webhittestresult.cpp
@@ -47,6 +47,7 @@ WebHitTestResult::WebHitTestResult(const WebPage *page, const QPoint &pos)
                           "    return window.getSelection().containsNode(e, true);"
                           "}"
                           "var res = {"
+                          "    baseUrl: document.baseURI,"
                           "    alternateText: e.getAttribute('alt'),"
                           "    boundingRect: '',"
                           "    imageUrl: '',"
@@ -83,7 +84,12 @@ WebHitTestResult::WebHitTestResult(const WebPage *page, const QPoint &pos)
     WebPage *p = const_cast<WebPage*>(page);
     m_viewportPos = p->mapToViewport(m_pos);
     const QString &js = source.arg(m_viewportPos.x()).arg(m_viewportPos.y());
-    init(page->url(), p->execJavaScript(js).toMap());
+    init(p->url(), p->execJavaScript(js).toMap());
+}
+
+QUrl WebHitTestResult::baseUrl() const
+{
+    return m_baseUrl;
 }
 
 QString WebHitTestResult::alternateText() const
@@ -161,6 +167,7 @@ void WebHitTestResult::init(const QUrl &url, const QVariantMap &map)
     if (map.isEmpty())
         return;
 
+    m_baseUrl = map.value(QSL("baseUrl")).toUrl();
     m_alternateText = map.value(QSL("alternateText")).toString();
     m_imageUrl = map.value(QSL("imageUrl")).toUrl();
     m_isContentEditable = map.value(QSL("contentEditable")).toBool();
@@ -179,8 +186,7 @@ void WebHitTestResult::init(const QUrl &url, const QVariantMap &map)
     if (!m_imageUrl.isEmpty())
         m_imageUrl = url.resolved(m_imageUrl);
     if (!m_linkUrl.isEmpty())
-        m_linkUrl = url.resolved(m_linkUrl);
+        m_linkUrl = m_baseUrl.resolved(m_linkUrl);
     if (!m_mediaUrl.isEmpty())
         m_mediaUrl = url.resolved(m_mediaUrl);
 }
-
diff --git a/src/lib/webengine/webhittestresult.h b/src/lib/webengine/webhittestresult.h
index d65f72d50..e167cacd9 100644
--- a/src/lib/webengine/webhittestresult.h
+++ b/src/lib/webengine/webhittestresult.h
@@ -32,6 +32,7 @@ class QUPZILLA_EXPORT WebHitTestResult
 public:
     explicit WebHitTestResult(const WebPage *page, const QPoint &pos);
 
+    QUrl baseUrl() const;
     QString alternateText() const;
     QRect boundingRect() const;
     QUrl imageUrl() const;
@@ -51,6 +52,7 @@ private:
     void init(const QUrl &url, const QVariantMap &map);
 
     bool m_isNull;
+    QUrl m_baseUrl;
     QString m_alternateText;
     QRect m_boundingRect;
     QUrl m_imageUrl;