Merge lp:~mardy/signon-ui/skip-final-url into lp:signon-ui

[Alberto Mardegan]

Avoid loading the final URL.

Successfully terminate the browser request as soon as we are requested to navigate to the final URL, without even attempting to load it.

[David King (amigadave)]

Works fine here.

review: Approve

=== modified file 'src/browser-request.cpp'
--- src/browser-request.cpp	2012-08-31 06:14:20 +0000
+++ src/browser-request.cpp	2012-09-10 06:23:22 +0000
@@ -85,6 +85,8 @@
         m_allowedSchemes = schemes;
     }
 
+    void setFinalUrl(const QUrl &url) { m_finalUrl = url; }
+
 protected:
     // reimplemented virtual methods
     QString userAgentForUrl(const QUrl &url) const
@@ -99,18 +101,32 @@
     {
         Q_UNUSED(type);
 
-        TRACE() << request.url();
+        QUrl url = request.url();
+        TRACE() << url;
+
+        /* We generally don't need to load the final URL, so skip loading it.
+         * If this behaviour is not desired for some requests, then just avoid
+         * calling setFinalUrl() */
+        if (url.host() == m_finalUrl.host() &&
+            url.path() == m_finalUrl.path()) {
+            Q_EMIT finalUrlReached(url);
+            return false;
+        }
+
         /* open all new window requests (identified by "frame == 0") in the
          * external browser, as well as other links according to the
          * ExternalLinksPattern and InternalLinksPattern rules. */
-        if (frame == 0 || urlIsBlocked(request.url())) {
-            QDesktopServices::openUrl(request.url());
+        if (frame == 0 || urlIsBlocked(url)) {
+            QDesktopServices::openUrl(url);
             return false;
         }
         /* Handle all other requests internally. */
         return true;
     }
 
+Q_SIGNALS:
+    void finalUrlReached(const QUrl &url);
+
 private:
     bool urlIsBlocked(QUrl url) const;
 
@@ -119,6 +135,7 @@
     QRegExp m_externalLinksPattern;
     QRegExp m_internalLinksPattern;
     QStringList m_allowedSchemes;
+    QUrl m_finalUrl;
 };
 
 bool WebPage::urlIsBlocked(QUrl url) const {
@@ -375,6 +392,14 @@
                      this, SLOT(onContentsChanged()));
     m_webView->setPage(page);
 
+    /* The following couple of lines serve to instruct the QWebPage not to load
+     * the final URL, but to block it and emit the finalUrlReached() signal
+     * instead.
+     */
+    page->setFinalUrl(finalUrl);
+    QObject::connect(page, SIGNAL(finalUrlReached(const QUrl&)),
+                     this, SLOT(onUrlChanged(const QUrl&)));
+
     /* set a per-identity cookie jar on the page */
     uint identity = 0;
     if (params.contains(SSOUI_KEY_IDENTITY)) {