Merge lp:~osomon/webbrowser-app/disable-favicon-provider-rtm into lp:webbrowser-app/rtm-14.09

[Olivier Tilloy]

Replace the custom favicon image provider with a FaviconFetcher component that better handles cancelling pending requests.

[Bill Filler (bfiller)]

we'll need to add an autopilot test (or qml test if that make sense) for this before it will be acceptable for rtm

review: Needs Fixing

[lp:~osomon/webbrowser-app/disable-favicon-provider-rtm]

776. By Olivier Tilloy on 2014-11-27

Replace the custom favicon image provider with a FaviconFetcher component that better handles cancelling pending requests.

[Olivier Tilloy (osomon)]

Following Florian’s suggestions, I replaced the custom favicon image provider with a FaviconFetcher component that better handles cancelling pending requests. It is fully unit-tested, including the use-case of emitting numerous queries in a row and ensuring that they are cancelled as a new one comes in.

=== modified file 'src/Ubuntu/Components/Extras/Browser/CMakeLists.txt'
--- src/Ubuntu/Components/Extras/Browser/CMakeLists.txt	2014-07-31 15:51:10 +0000
+++ src/Ubuntu/Components/Extras/Browser/CMakeLists.txt	2014-11-27 10:18:45 +0000
@@ -4,11 +4,11 @@
 
 set(PLUGIN ubuntu-ui-extras-browser-plugin)
 
-set(PLUGIN_SRC favicon-image-provider.cpp plugin.cpp)
+set(PLUGIN_SRC plugin.cpp)
 
 add_library(${PLUGIN} MODULE ${PLUGIN_SRC})
 
-qt5_use_modules(${PLUGIN} Core Gui Network Qml Quick)
+qt5_use_modules(${PLUGIN} Core Gui Qml)
 
 file(GLOB QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml qmldir *.js)
 install(TARGETS ${PLUGIN} DESTINATION ${WEBBROWSER_IMPORTS_DIR})

=== modified file 'src/Ubuntu/Web/CMakeLists.txt'
--- src/Ubuntu/Web/CMakeLists.txt	2014-07-31 15:51:10 +0000
+++ src/Ubuntu/Web/CMakeLists.txt	2014-11-27 10:18:45 +0000
@@ -4,11 +4,11 @@
 
 set(PLUGIN ubuntu-web-plugin)
 
-set(PLUGIN_SRC favicon-image-provider.cpp plugin.cpp)
+set(PLUGIN_SRC plugin.cpp)
 
 add_library(${PLUGIN} MODULE ${PLUGIN_SRC})
 
-qt5_use_modules(${PLUGIN} Core Gui Network Qml Quick)
+qt5_use_modules(${PLUGIN} Core Gui Qml)
 
 file(GLOB QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml qmldir *.js)
 install(TARGETS ${PLUGIN} DESTINATION ${UBUNTU_WEB_IMPORTS_DIR})

=== removed file 'src/Ubuntu/Web/favicon-image-provider.cpp'
--- src/Ubuntu/Web/favicon-image-provider.cpp	2014-09-30 10:40:46 +0000
+++ src/Ubuntu/Web/favicon-image-provider.cpp	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This file is part of webbrowser-app.
- *
- * webbrowser-app is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * webbrowser-app is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "favicon-image-provider.h"
-
-// Qt
-#include <QtCore/QCryptographicHash>
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QEventLoop>
-#include <QtCore/QFileInfo>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QUrl>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QNetworkRequest>
-
-#define MAX_REDIRECTIONS 5
-#define CACHE_EXPIRATION_DAYS 100
-
-FaviconImageProvider::FaviconImageProvider()
-    : QQuickImageProvider(QQmlImageProviderBase::Image, QQmlImageProviderBase::ForceAsynchronousImageLoading)
-{
-    QDir cacheLocation(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/favicons");
-    m_cacheLocation = cacheLocation.absolutePath();
-    if (!cacheLocation.exists()) {
-        QDir::root().mkpath(m_cacheLocation);
-    }
-}
-
-const QString& FaviconImageProvider::cacheLocation() const
-{
-    return m_cacheLocation;
-}
-
-QImage FaviconImageProvider::requestImage(const QString& id, QSize* size, const QSize& requestedSize)
-{
-    if (id.isEmpty()) {
-        return QImage();
-    }
-
-    QString extension;
-    int extensionIndex = id.lastIndexOf(".");
-    if (extensionIndex != -1) {
-        extension = id.mid(extensionIndex);
-    }
-    QString hash(QCryptographicHash::hash(id.toUtf8(), QCryptographicHash::Md5).toHex());
-    QString filepath = m_cacheLocation + "/" + hash + extension;
-
-    QImage image;
-    QFileInfo fileinfo(filepath);
-    if (fileinfo.exists()) {
-        if (fileinfo.lastModified().daysTo(QDateTime::currentDateTime()) > CACHE_EXPIRATION_DAYS) {
-            image = downloadImage(id);
-            if (!image.isNull()) {
-                image.save(filepath);
-            }
-        } else {
-            image.load(filepath);
-        }
-    } else {
-        image = downloadImage(id);
-        if (!image.isNull()) {
-            image.save(filepath);
-        }
-    }
-
-    if (!image.isNull()) {
-        *size = image.size();
-    }
-    if (!image.isNull() && requestedSize.isValid() && (image.size() != requestedSize)) {
-        return image.scaled(requestedSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-    } else {
-        return image;
-    }
-}
-
-QImage FaviconImageProvider::downloadImage(const QUrl& url)
-{
-    if (!m_manager) {
-        m_manager.reset(new QNetworkAccessManager());
-    }
-    QUrl currentUrl(url);
-    int redirections = 0;
-    while (redirections < MAX_REDIRECTIONS) {
-        QNetworkRequest request(currentUrl);
-        request.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
-        QEventLoop loop;
-        QObject::connect(m_manager.data(), SIGNAL(finished(QNetworkReply*)), &loop, SLOT(quit()));
-        QNetworkReply* reply = m_manager->get(request);
-        loop.exec();
-        currentUrl = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
-        if (currentUrl.isEmpty()) {
-            if (reply->error() != QNetworkReply::NoError) {
-                qWarning() << "Failed to download" << url << ":" << reply->errorString();
-                delete reply;
-                return QImage();
-            } else {
-                QByteArray data = reply->readAll();
-                delete reply;
-                return QImage::fromData(data);
-            }
-        } else {
-            delete reply;
-            ++redirections;
-        }
-    }
-    qWarning() << "Failed to download" << url << ": too many redirections";
-    return QImage();
-}

=== removed file 'src/Ubuntu/Web/favicon-image-provider.h'
--- src/Ubuntu/Web/favicon-image-provider.h	2014-09-30 10:40:46 +0000
+++ src/Ubuntu/Web/favicon-image-provider.h	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This file is part of webbrowser-app.
- *
- * webbrowser-app is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * webbrowser-app is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __FAVICON_IMAGE_PROVIDER_H__
-#define __FAVICON_IMAGE_PROVIDER_H__
-
-// Qt
-#include <QtCore/QScopedPointer>
-#include <QtCore/QString>
-#include <QtCore/QtGlobal>
-#include <QtQuick/QQuickImageProvider>
-
-class QNetworkAccessManager;
-class QUrl;
-
-class FaviconImageProvider Q_DECL_FINAL : public QQuickImageProvider
-{
-public:
-    FaviconImageProvider();
-
-    const QString& cacheLocation() const;
-
-    QImage requestImage(const QString& id, QSize* size, const QSize& requestedSize);
-
-private:
-    QImage downloadImage(const QUrl& url);
-
-    QString m_cacheLocation;
-    QScopedPointer<QNetworkAccessManager> m_manager;
-};
-
-#endif // __FAVICON_IMAGE_PROVIDER_H__

=== modified file 'src/Ubuntu/Web/plugin.cpp'
--- src/Ubuntu/Web/plugin.cpp	2014-10-06 14:12:48 +0000
+++ src/Ubuntu/Web/plugin.cpp	2014-11-27 10:18:45 +0000
@@ -17,7 +17,6 @@
  */
 
 #include "plugin.h"
-#include "favicon-image-provider.h"
 
 // Qt
 #include <QtCore/QDir>
@@ -115,8 +114,6 @@
     context->setContextProperty("formFactor", getFormFactor());
     context->setContextProperty("webviewDevtoolsDebugPort", getDevtoolsPort());
     context->setContextProperty("webviewDevtoolsDebugHost", getDevtoolsHost());
-
-    engine->addImageProvider("favicon", new FaviconImageProvider());
 }
 
 void UbuntuBrowserPlugin::registerTypes(const char* uri)

=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2014-08-06 13:57:06 +0000
+++ src/app/CMakeLists.txt	2014-11-27 10:18:45 +0000
@@ -9,13 +9,14 @@
 
 set(COMMONLIB_SRC
     browserapplication.cpp
+    favicon-fetcher.cpp
     session-storage.cpp
     webbrowser-window.cpp
 )
 
 add_library(${COMMONLIB} STATIC ${COMMONLIB_SRC})
 
-qt5_use_modules(${COMMONLIB} Core Network Qml Quick Widgets)
+qt5_use_modules(${COMMONLIB} Core Gui Network Qml Quick Widgets)
 
 include_directories(${Qt5Quick_PRIVATE_INCLUDE_DIRS})
 

=== modified file 'src/app/Favicon.qml'
--- src/app/Favicon.qml	2014-09-26 13:29:30 +0000
+++ src/app/Favicon.qml	2014-11-27 10:18:45 +0000
@@ -18,9 +18,10 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.1
+import webbrowsercommon.private 0.1
 
 Item {
-    property url source
+    property alias source: fetcher.url
     property bool fallbackIcon: true
 
     width: units.dp(16)
@@ -28,15 +29,18 @@
 
     Image {
         id: image
-        readonly property string url: parent.source.toString()
-        source: url ? "image://favicon/" + url : ""
-
+        source: fetcher.localUrl
         anchors.fill: parent
     }
 
+    FaviconFetcher {
+        id: fetcher
+    }
+
     Icon {
         anchors.fill: parent
         name: "stock_website"
-        visible: parent.fallbackIcon && (image.status !== Image.Ready)
+        visible: parent.fallbackIcon &&
+                 ((image.status !== Image.Ready) || !image.source.toString())
     }
 }

=== modified file 'src/app/browserapplication.cpp'
--- src/app/browserapplication.cpp	2014-10-02 20:47:10 +0000
+++ src/app/browserapplication.cpp	2014-11-27 10:18:45 +0000
@@ -35,6 +35,7 @@
 // local
 #include "browserapplication.h"
 #include "config.h"
+#include "favicon-fetcher.h"
 #include "session-storage.h"
 #include "webbrowser-window.h"
 
@@ -143,6 +144,7 @@
     }
 
     const char* uri = "webbrowsercommon.private";
+    qmlRegisterType<FaviconFetcher>(uri, 0, 1, "FaviconFetcher");
     qmlRegisterType<SessionStorage>(uri, 0, 1, "SessionStorage");
 
     m_engine = new QQmlEngine;

=== added file 'src/app/favicon-fetcher.cpp'
--- src/app/favicon-fetcher.cpp	1970-01-01 00:00:00 +0000
+++ src/app/favicon-fetcher.cpp	2014-11-27 10:18:45 +0000
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "favicon-fetcher.h"
+
+// Qt
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QMetaObject>
+#include <QtCore/QStandardPaths>
+#include <QtGui/QImage>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QNetworkRequest>
+
+#define MAX_REDIRECTIONS 5
+#define CACHE_EXPIRATION_DAYS 100
+
+FaviconFetcher::FaviconFetcher(QObject* parent)
+    : QObject(parent)
+    , m_reply(0)
+{
+    QDir cacheLocation(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/favicons");
+    m_cacheLocation = cacheLocation.absolutePath();
+    if (!cacheLocation.exists()) {
+        QDir::root().mkpath(m_cacheLocation);
+    }
+}
+
+FaviconFetcher::~FaviconFetcher()
+{
+    if (m_reply) {
+        m_reply->abort();
+        delete m_reply;
+    }
+}
+
+const QUrl& FaviconFetcher::url() const
+{
+    return m_url;
+}
+
+void FaviconFetcher::setUrl(const QUrl& url)
+{
+    if (url != m_url) {
+        m_url = url;
+        Q_EMIT urlChanged();
+
+        setLocalUrl(QUrl());
+
+        if (m_reply) {
+            m_reply->abort();
+            m_reply = 0;
+        }
+
+        if (!url.isValid()) {
+            return;
+        }
+
+        if (url.isLocalFile()) {
+            setLocalUrl(url);
+            return;
+        }
+
+        QString id = url.toString(QUrl::None);
+
+        QString extension;
+        int extensionIndex = id.lastIndexOf(".");
+        if (extensionIndex != -1) {
+            extension = id.mid(extensionIndex);
+        }
+
+        QString hash(QCryptographicHash::hash(id.toUtf8(), QCryptographicHash::Md5).toHex());
+        m_filepath = m_cacheLocation + "/" + hash + extension;
+
+        QFileInfo fileinfo(m_filepath);
+        if (fileinfo.exists() && (fileinfo.lastModified().daysTo(QDateTime::currentDateTime()) < CACHE_EXPIRATION_DAYS)) {
+            setLocalUrl(QUrl::fromLocalFile(m_filepath));
+        } else {
+            m_redirections = 0;
+            download(url);
+        }
+    }
+}
+
+const QUrl& FaviconFetcher::localUrl() const
+{
+    return m_localUrl;
+}
+
+void FaviconFetcher::setLocalUrl(const QUrl& url)
+{
+    if (url != m_localUrl) {
+        m_localUrl = url;
+        Q_EMIT localUrlChanged();
+    }
+}
+
+const QString& FaviconFetcher::cacheLocation() const
+{
+    return m_cacheLocation;
+}
+
+void FaviconFetcher::download(const QUrl& url)
+{
+    if (!m_manager) {
+        m_manager.reset(new QNetworkAccessManager());
+        connect(m_manager.data(), SIGNAL(finished(QNetworkReply*)),
+                this, SLOT(downloadFinished(QNetworkReply*)));
+    }
+    QNetworkRequest request(url);
+    request.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
+    // For some reason slashdot.org closes the connection with the default
+    // user agent string ("Mozilla/5.0"). Weird.
+    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Mozilla"));
+    m_reply = m_manager->get(request);
+}
+
+void FaviconFetcher::downloadFinished(QNetworkReply* reply)
+{
+    if (reply->error() == QNetworkReply::OperationCanceledError) {
+        reply->deleteLater();
+        return;
+    }
+    QUrl url = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
+    if (url.isEmpty()) {
+        if (reply->error() == QNetworkReply::NoError) {
+            QByteArray data = reply->readAll();
+            if (QImage::fromData(data).save(m_filepath)) {
+                setLocalUrl(QUrl::fromLocalFile(m_filepath));
+            }
+        } else {
+            qWarning() << "Failed to download" << reply->url()
+                       << ":" << reply->errorString();
+        }
+        reply->deleteLater();
+        m_reply = 0;
+    } else {
+        reply->deleteLater();
+        m_reply = 0;
+        if (++m_redirections < MAX_REDIRECTIONS) {
+            QMetaObject::invokeMethod(this, "download",
+                                      Qt::QueuedConnection,
+                                      Q_ARG(QUrl, url));
+        } else {
+            qWarning() << "Failed to download" << m_url
+                       << ": too many redirections";
+        }
+    }
+}

=== added file 'src/app/favicon-fetcher.h'
--- src/app/favicon-fetcher.h	1970-01-01 00:00:00 +0000
+++ src/app/favicon-fetcher.h	2014-11-27 10:18:45 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __FAVICON_FETCHER_H__
+#define __FAVICON_FETCHER_H__
+
+// Qt
+#include <QtCore/QScopedPointer>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QtGlobal>
+#include <QtCore/QUrl>
+
+class QNetworkAccessManager;
+class QNetworkReply;
+
+class FaviconFetcher Q_DECL_FINAL : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
+    Q_PROPERTY(QUrl localUrl READ localUrl NOTIFY localUrlChanged)
+
+public:
+    FaviconFetcher(QObject* parent=0);
+    ~FaviconFetcher();
+
+    const QUrl& url() const;
+    void setUrl(const QUrl& url);
+
+    const QUrl& localUrl() const;
+
+    const QString& cacheLocation() const;
+
+Q_SIGNALS:
+    void urlChanged() const;
+    void localUrlChanged() const;
+
+private Q_SLOTS:
+    void download(const QUrl& url);
+    void downloadFinished(QNetworkReply* reply);
+
+private:
+    void setLocalUrl(const QUrl& url);
+
+    QString m_cacheLocation;
+    QScopedPointer<QNetworkAccessManager> m_manager;
+    QNetworkReply* m_reply;
+    QUrl m_url;
+    QString m_filepath;
+    int m_redirections;
+    QUrl m_localUrl;
+};
+
+#endif // __FAVICON_FETCHER_H__

=== modified file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt	2014-10-03 14:41:48 +0000
+++ tests/unittests/CMakeLists.txt	2014-11-27 10:18:45 +0000
@@ -15,4 +15,4 @@
 add_subdirectory(cookie-store)
 add_subdirectory(oxide-cookie-helper)
 add_subdirectory(session-storage)
-add_subdirectory(favicon-image-provider)
+add_subdirectory(favicon-fetcher)

=== added directory 'tests/unittests/favicon-fetcher'
=== added file 'tests/unittests/favicon-fetcher/CMakeLists.txt'
--- tests/unittests/favicon-fetcher/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unittests/favicon-fetcher/CMakeLists.txt	2014-11-27 10:18:45 +0000
@@ -0,0 +1,10 @@
+set(TEST tst_FaviconFetcherTests)
+set(SOURCES
+    ${webbrowser-common_SOURCE_DIR}/favicon-fetcher.cpp
+    tst_FaviconFetcherTests.cpp
+)
+add_executable(${TEST} ${SOURCES})
+include_directories(${webbrowser-common_SOURCE_DIR})
+qt5_use_modules(${TEST} Core Gui Network Test)
+add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml)
+set_tests_properties(${TEST} PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")

=== added file 'tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp'
--- tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp	2014-11-27 10:18:45 +0000
@@ -0,0 +1,280 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// system
+#include <utime.h>
+
+// Qt
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
+#include <QtCore/QRegExp>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QTextStream>
+#include <QtNetwork/QTcpServer>
+#include <QtNetwork/QTcpSocket>
+#include <QtTest/QSignalSpy>
+#include <QtTest/QtTest>
+
+// local
+#include "favicon-fetcher.h"
+
+const char icon_data[] = {
+    0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x00,
+    0x01, 0x00, 0x38, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x28, 0x00,
+    0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00,
+    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+const int icon_data_size = 78;
+
+class TestHTTPServer : public QTcpServer
+{
+    Q_OBJECT
+
+public:
+    TestHTTPServer(QObject* parent = 0)
+        : QTcpServer(parent)
+    {}
+
+    QString baseURL() const
+    {
+        return "http://" + serverAddress().toString() + ":" + QString::number(serverPort());
+    }
+
+Q_SIGNALS:
+    void gotRequest(const QString& path) const;
+
+protected:
+    void incomingConnection(qintptr socketDescriptor)
+    {
+        QTcpSocket* socket = new QTcpSocket(this);
+        connect(socket, SIGNAL(readyRead()), SLOT(readClient()));
+        connect(socket, SIGNAL(disconnected()), SLOT(discardClient()));
+        socket->setSocketDescriptor(socketDescriptor);
+    }
+
+private Q_SLOTS:
+    void readClient()
+    {
+        QTcpSocket* socket = qobject_cast<QTcpSocket*>(sender());
+        if (!socket) {
+            return;
+        }
+        if (!socket->canReadLine()) {
+            return;
+        }
+        QStringList tokens = QString(socket->readLine()).split(QRegExp("[ \r\n][ \r\n]*"));
+        if (tokens.isEmpty()) {
+            return;
+        }
+        if (tokens.first() != "GET") {
+            return;
+        }
+        QString path = tokens[1];
+        Q_EMIT gotRequest(path);
+        QTextStream response(socket);
+        response.setAutoDetectUnicode(true);
+        QRegExp icon("/\\w+\\.ico");
+        QRegExp redirection("^/redirect/(\\d+)/(.*)");
+        if (icon.exactMatch(path)) {
+            response << "HTTP/1.0 200 OK\r\n"
+                     << "Content-Length: " << icon_data_size << "\r\n"
+                     << "Content-Type: image/x-icon\r\n\r\n"
+                     << QString::fromLocal8Bit(icon_data, icon_data_size) << "\n";
+        } else if (redirection.exactMatch(path)) {
+            int n = redirection.cap(1).toInt();
+            response << "HTTP/1.0 303 See Other\r\n"
+                     << "Content-Length: 9\r\n"
+                     << "Content-Type: text/plain\r\n"
+                     << "Location: " << baseURL();
+            if (n == 1) {
+                response << "/" << redirection.cap(2);
+            } else {
+                response << "/redirect/" << (n - 1) << "/" << redirection.cap(2);
+            }
+            response << "\r\n\r\n"
+                     << "see other\n";
+        } else {
+            response << "HTTP/1.0 404 Not Found\r\n"
+                     << "Content-Length: 9\r\n"
+                     << "Content-Type: text/plain\r\n\r\n"
+                     << "not found\n";
+        }
+        response.flush();
+        socket->waitForBytesWritten();
+        socket->disconnectFromHost();
+    }
+
+    void discardClient()
+    {
+        QTcpSocket* socket = qobject_cast<QTcpSocket*>(sender());
+        if (socket) {
+            socket->deleteLater();
+        }
+    }
+};
+
+class FaviconFetcherTests : public QObject
+{
+    Q_OBJECT
+
+private:
+    FaviconFetcher* fetcher;
+    QSignalSpy* fetcherSpy;
+    TestHTTPServer* server;
+    QSignalSpy* serverSpy;
+
+private Q_SLOTS:
+    void init()
+    {
+        {
+            FaviconFetcher temp;
+            QDir(temp.cacheLocation()).removeRecursively();
+        }
+        fetcher = new FaviconFetcher;
+        fetcherSpy = new QSignalSpy(fetcher, SIGNAL(localUrlChanged()));
+        server = new TestHTTPServer;
+        server->listen();
+        serverSpy = new QSignalSpy(server, SIGNAL(gotRequest(const QString&)));
+    }
+
+    void cleanup()
+    {
+        delete serverSpy;
+        delete server;
+        delete fetcherSpy;
+        delete fetcher;
+    }
+
+    void shouldCacheIcon()
+    {
+        QUrl url(server->baseURL() + "/favicon1.ico");
+        fetcher->setUrl(url);
+        QCOMPARE(fetcher->url(), url);
+        QVERIFY(fetcherSpy->wait());
+        QCOMPARE(serverSpy->count(), 1);
+        QString cached = fetcher->localUrl().path();
+        QVERIFY(cached.startsWith(fetcher->cacheLocation()));
+        QVERIFY(QFileInfo::exists(cached));
+    }
+
+    void shouldNotCacheLocalIcon()
+    {
+        QUrl url("file:///tmp/favicon.ico");
+        fetcher->setUrl(url);
+        QCOMPARE(fetcherSpy->count(), 1);
+        QVERIFY(serverSpy->isEmpty());
+        QCOMPARE(fetcher->localUrl(), url);
+        QDir cache(fetcher->cacheLocation(), "", QDir::Unsorted, QDir::Files | QDir::NoDotAndDotDot);
+        QCOMPARE(cache.count(), (uint) 0);
+    }
+
+    void shouldNotCacheInvalidIcon()
+    {
+        // First fetch a valid icon to ensure localUrl is initially not empty
+        QUrl url(server->baseURL() + "/favicon1.ico");
+        fetcher->setUrl(url);
+        QVERIFY(fetcherSpy->wait());
+        QVERIFY(!fetcher->localUrl().isEmpty());
+        // Then request an invalid one
+        url = QUrl(server->baseURL() + "/invalid");
+        fetcher->setUrl(url);
+        QVERIFY(serverSpy->wait());
+        QVERIFY(fetcher->localUrl().isEmpty());
+    }
+
+    void shouldReturnCachedIcon()
+    {
+        // First fetch an icon so that it’s cached
+        QUrl url(server->baseURL() + "/favicon1.ico");
+        fetcher->setUrl(url);
+        QVERIFY(fetcherSpy->wait());
+        QUrl localUrl = fetcher->localUrl();
+        QVERIFY(!localUrl.isEmpty());
+        // Then fetch another icon
+        fetcher->setUrl(QUrl(server->baseURL() + "/favicon2.ico"));
+        QVERIFY(fetcherSpy->wait());
+        QVERIFY(!fetcher->localUrl().isEmpty());
+        // Then fetch the first icon again, and verify it comes from the cache
+        serverSpy->clear();
+        fetcher->setUrl(url);
+        QCOMPARE(fetcher->localUrl(), localUrl);
+        QVERIFY(serverSpy->isEmpty());
+    }
+
+    void shouldHandleRedirections()
+    {
+        QUrl url(server->baseURL() + "/redirect/3/favicon1.ico");
+        fetcher->setUrl(url);
+        QVERIFY(fetcherSpy->wait());
+        QCOMPARE(serverSpy->count(), 4);
+    }
+
+    void shouldNotHandleTooManyRedirections()
+    {
+        QUrl url(server->baseURL() + "/redirect/8/favicon1.ico");
+        fetcher->setUrl(url);
+        for (int i = 0; i < 5; ++i)
+        QVERIFY(!fetcherSpy->wait(500));
+        QCOMPARE(serverSpy->count(), 5);
+    }
+
+    void shouldDiscardOldCachedIcons()
+    {
+        // First fetch an icon, and touch the cached file on disk to ensure
+        // it will be considered out of date next time it’s requested
+        QUrl url(server->baseURL() + "/favicon1.ico");
+        fetcher->setUrl(url);
+        QVERIFY(fetcherSpy->wait());
+        QUrl localUrl = fetcher->localUrl();
+        struct utimbuf ubuf;
+        ubuf.modtime = QDateTime::currentDateTime().addYears(-1).toTime_t();
+        QCOMPARE(utime(localUrl.path().toUtf8().constData(), &ubuf), 0);
+        // Then fetch another icon
+        fetcher->setUrl(QUrl(server->baseURL() + "/favicon2.ico"));
+        QVERIFY(fetcherSpy->wait());
+        QVERIFY(!fetcher->localUrl().isEmpty());
+        // Then fetch the first icon again, and verify it is being re-downloaded
+        serverSpy->clear();
+        fetcher->setUrl(url);
+        QVERIFY(fetcherSpy->wait());
+        QCOMPARE(fetcher->localUrl(), localUrl);
+        QCOMPARE(serverSpy->count(), 1);
+    }
+
+    void shouldCancelRequests()
+    {
+        // Issue several requests rapidly in succession, and verify that
+        // all the previous ones are discarded
+        for (int i = 1; i < 10; ++i) {
+            QUrl url(server->baseURL() + "/favicon" + QString::number(i) + ".ico");
+            fetcher->setUrl(url);
+            QVERIFY(serverSpy->wait());
+        }
+        QVERIFY(fetcherSpy->wait());
+        QCOMPARE(serverSpy->count(), 9);
+        QCOMPARE(fetcherSpy->count(), 1);
+    }
+};
+
+QTEST_MAIN(FaviconFetcherTests)
+
+#include "tst_FaviconFetcherTests.moc"

=== removed directory 'tests/unittests/favicon-image-provider'
=== removed file 'tests/unittests/favicon-image-provider/CMakeLists.txt'
--- tests/unittests/favicon-image-provider/CMakeLists.txt	2014-09-30 11:52:33 +0000
+++ tests/unittests/favicon-image-provider/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-set(TEST tst_FaviconImageProviderTests)
-set(SOURCES
-    ${ubuntu-web-plugin_SOURCE_DIR}/favicon-image-provider.cpp
-    tst_FaviconImageProviderTests.cpp
-)
-add_executable(${TEST} ${SOURCES})
-include_directories(${ubuntu-web-plugin_SOURCE_DIR})
-qt5_use_modules(${TEST} Core Quick Network Test)
-add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml)
-set_tests_properties(${TEST} PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")

=== removed file 'tests/unittests/favicon-image-provider/tst_FaviconImageProviderTests.cpp'
--- tests/unittests/favicon-image-provider/tst_FaviconImageProviderTests.cpp	2014-09-30 10:40:46 +0000
+++ tests/unittests/favicon-image-provider/tst_FaviconImageProviderTests.cpp	1970-01-01 00:00:00 +0000
@@ -1,242 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This file is part of webbrowser-app.
- *
- * webbrowser-app is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * webbrowser-app is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// system
-#include <utime.h>
-
-// Qt
-#include <QtCore/QDateTime>
-#include <QtCore/QDir>
-#include <QtCore/QRegExp>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QTcpServer>
-#include <QtTest/QtTest>
-
-// local
-#include "favicon-image-provider.h"
-
-const char icon_data[] = {
-    0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x00,
-    0x01, 0x00, 0x38, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x28, 0x00,
-    0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00,
-    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-const int icon_data_size = 78;
-
-class TestHTTPServer : public QTcpServer
-{
-    Q_OBJECT
-
-public:
-    QStringList requests;
-
-    TestHTTPServer(QObject* parent = 0)
-        : QTcpServer(parent)
-    {}
-
-    QString baseURL() const
-    {
-        return "http://" + serverAddress().toString() + ":" + QString::number(serverPort());
-    }
-
-protected:
-    void incomingConnection(qintptr socketDescriptor)
-    {
-        QTcpSocket* socket = new QTcpSocket(this);
-        connect(socket, SIGNAL(readyRead()), SLOT(readClient()));
-        connect(socket, SIGNAL(disconnected()), SLOT(discardClient()));
-        socket->setSocketDescriptor(socketDescriptor);
-    }
-
-private Q_SLOTS:
-    void readClient()
-    {
-        QTcpSocket* socket = qobject_cast<QTcpSocket*>(sender());
-        if (!socket) {
-            return;
-        }
-        if (!socket->canReadLine()) {
-            return;
-        }
-        QStringList tokens = QString(socket->readLine()).split(QRegExp("[ \r\n][ \r\n]*"));
-        if (tokens.isEmpty()) {
-            return;
-        }
-        if (tokens.first() != "GET") {
-            return;
-        }
-        QString path = tokens[1];
-        requests << path;
-        QTextStream response(socket);
-        response.setAutoDetectUnicode(true);
-        QRegExp icon("/\\w+\\.ico");
-        QRegExp redirection("^/redirect/(\\d+)/(.*)");
-        if (icon.exactMatch(path)) {
-            response << "HTTP/1.0 200 OK\r\n"
-                     << "Content-Length: " << icon_data_size << "\r\n"
-                     << "Content-Type: image/x-icon\r\n\r\n"
-                     << QString::fromLocal8Bit(icon_data, icon_data_size) << "\n";
-        } else if (path == "/invalid") {
-            response << "HTTP/1.0 404 Not Found\r\n"
-                     << "Content-Length: 9\r\n"
-                     << "Content-Type: text/plain\r\n\r\n"
-                     << "not found\n";
-        } else if (redirection.exactMatch(path)) {
-            int n = redirection.cap(1).toInt();
-            response << "HTTP/1.0 303 See Other\r\n"
-                     << "Content-Length: 9\r\n"
-                     << "Content-Type: text/plain\r\n"
-                     << "Location: " << baseURL();
-            if (n == 1) {
-                response << "/" << redirection.cap(2);
-            } else {
-                response << "/redirect/" << (n - 1) << "/" << redirection.cap(2);
-            }
-            response << "\r\n\r\n"
-                     << "see other\n";
-        }
-        socket->close();
-    }
-
-    void discardClient()
-    {
-        QTcpSocket* socket = qobject_cast<QTcpSocket*>(sender());
-        if (socket) {
-            socket->deleteLater();
-        }
-    }
-};
-
-class FaviconImageProviderTests : public QObject
-{
-    Q_OBJECT
-
-private:
-    FaviconImageProvider* provider;
-    TestHTTPServer* server;
-
-private Q_SLOTS:
-    void init()
-    {
-        {
-            FaviconImageProvider temp;
-            QDir(temp.cacheLocation()).removeRecursively();
-        }
-        provider = new FaviconImageProvider;
-        server = new TestHTTPServer;
-        server->listen();
-    }
-
-    void cleanup()
-    {
-        delete server;
-        delete provider;
-    }
-
-    void shouldDiscardEmptyRequests()
-    {
-        QSize size;
-        QImage icon = provider->requestImage("", &size, QSize());
-        QVERIFY(icon.isNull());
-        QVERIFY(!size.isValid());
-    }
-
-    void shouldFetchIcon()
-    {
-        QSize size;
-        QImage icon = provider->requestImage(server->baseURL() + "/favicon1.ico", &size, QSize());
-        QVERIFY(!icon.isNull());
-        QCOMPARE(icon.size(), QSize(1, 1));
-        QCOMPARE(size, QSize(1, 1));
-        QCOMPARE(server->requests.size(), 1);
-    }
-
-    void shouldNotFetchInvalidIcon()
-    {
-        QSize size;
-        QImage icon = provider->requestImage(server->baseURL() + "/invalid", &size, QSize());
-        QVERIFY(icon.isNull());
-        QVERIFY(!size.isValid());
-        QCOMPARE(server->requests.size(), 1);
-    }
-
-    void shouldReturnCachedIcon()
-    {
-        QSize size;
-        QImage icon = provider->requestImage(server->baseURL() + "/favicon2.ico", &size, QSize());
-        QVERIFY(!icon.isNull());
-        QCOMPARE(server->requests.size(), 1);
-        server->requests.clear();
-        QImage icon2 = provider->requestImage(server->baseURL() + "/favicon2.ico", &size, QSize());
-        QVERIFY(!icon2.isNull());
-        QVERIFY(server->requests.isEmpty());
-    }
-
-    void shouldHandleRedirections()
-    {
-        QSize size;
-        QImage icon = provider->requestImage(server->baseURL() + "/redirect/3/favicon3.ico", &size, QSize());
-        QVERIFY(!icon.isNull());
-        QCOMPARE(icon.size(), QSize(1, 1));
-        QCOMPARE(size, QSize(1, 1));
-        QCOMPARE(server->requests.size(), 4);
-    }
-
-    void shouldNotHandleTooManyRedirections()
-    {
-        QSize size;
-        QImage icon = provider->requestImage(server->baseURL() + "/redirect/8/favicon4.ico", &size, QSize());
-        QVERIFY(icon.isNull());
-        QVERIFY(!size.isValid());
-        QCOMPARE(server->requests.size(), 5);
-    }
-
-    void shouldScaleIcon()
-    {
-        QSize size;
-        QImage icon = provider->requestImage(server->baseURL() + "/favicon5.ico", &size, QSize(3, 3));
-        QVERIFY(!icon.isNull());
-        QCOMPARE(icon.size(), QSize(3, 3));
-        QCOMPARE(size, QSize(1, 1));
-    }
-
-    void shouldDiscardOldCachedIcons()
-    {
-        QSize size;
-        QImage icon = provider->requestImage(server->baseURL() + "/favicon6.ico", &size, QSize());
-        QVERIFY(!icon.isNull());
-        server->requests.clear();
-        QDir cache(provider->cacheLocation(), "", QDir::Unsorted, QDir::Files | QDir::NoDotAndDotDot);
-        QCOMPARE(cache.count(), (uint) 1);
-        QString filepath = cache.filePath(cache[0]);
-        struct utimbuf ubuf;
-        ubuf.modtime = QDateTime::currentDateTime().addYears(-1).toTime_t();
-        QCOMPARE(utime(filepath.toUtf8().constData(), &ubuf), 0);
-        icon = provider->requestImage(server->baseURL() + "/favicon6.ico", &size, QSize());
-        QVERIFY(!icon.isNull());
-        QCOMPARE(server->requests.size(), 1);
-    }
-};
-
-QTEST_MAIN(FaviconImageProviderTests)
-#include "tst_FaviconImageProviderTests.moc"

=== modified file 'tests/unittests/qml/CMakeLists.txt'
--- tests/unittests/qml/CMakeLists.txt	2014-08-22 13:49:15 +0000
+++ tests/unittests/qml/CMakeLists.txt	2014-11-27 10:18:45 +0000
@@ -7,8 +7,13 @@
 endif()
 
 set(TEST tst_QmlTests)
-add_executable(${TEST} tst_QmlTests.cpp)
-qt5_use_modules(${TEST} QuickTest)
+set(SOURCES
+    ${webbrowser-common_SOURCE_DIR}/favicon-fetcher.cpp
+    tst_QmlTests.cpp
+)
+add_executable(${TEST} ${SOURCES})
+qt5_use_modules(${TEST} Qml QuickTest)
+include_directories(${webbrowser-common_SOURCE_DIR})
 add_test(${TEST} ${XVFB_COMMAND} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -import ${CMAKE_BINARY_DIR}/src)
 
 # copy qml files under test to build dir

=== modified file 'tests/unittests/qml/tst_QmlTests.cpp'
--- tests/unittests/qml/tst_QmlTests.cpp	2014-08-22 13:49:15 +0000
+++ tests/unittests/qml/tst_QmlTests.cpp	2014-11-27 10:18:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,6 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// Qt
+#include <QtQml/QtQml>
 #include <QtQuickTest/QtQuickTest>
-QUICK_TEST_MAIN(QmlTests)
-
+
+// local
+#include "favicon-fetcher.h"
+
+int main(int argc, char** argv)
+{
+    const char* uri = "webbrowsercommon.private";
+    qmlRegisterType<FaviconFetcher>(uri, 0, 1, "FaviconFetcher");
+
+    return quick_test_main(argc, argv, "QmlTests", 0);
+}