Merge lp:~osomon/webbrowser-app/thumbnails into lp:webbrowser-app

[Olivier Tilloy]

Display thumbnails of the web pages in the activity view.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:204
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/194/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/952/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/77/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/77/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/77/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/956/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/194/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:204
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/195/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/966/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/970/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/195/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/thumbnails]

205. By Olivier Tilloy on 2013-07-10

Fix FTBFS in a clean environment.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:205
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/196/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/982
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/79
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/79/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/986
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/986/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/840

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/196/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/thumbnails]

206. By Olivier Tilloy on 2013-07-11

Set the original size of the image.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:206
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/197/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/997
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/80/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1001
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1001/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/854

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/197/rebuild

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

Looks like there is a jenkins issue causing a failure, but I tested the functionality and it works well and looks good. Before we land this I'd like to understand the impact on memory this has to make sure it is acceptable. And I have a few other questions..

Specifically:
- roughly what is the memory usage associated with generating and loading each thumbnail
- how can we limit the thumbnail cache as this seems it will grow limitlessly as history grows. We probably need some sort of hard limit on disk size or number stored so we don't chew up the users disk space. And a way to recreate if one from the cache doesn't exist.
- Are all thumbnails for the history items loaded in memory when the browser is started?
- Or do we only load thumbnails for images that are visible on the screen? I hope so :)

We should ensure that if you have hundreds/thousands of history items (which is likely) that we're not creating and loading thumbnails for all of these up front but only on demand.

[Olivier Tilloy (osomon)]

> Looks like there is a jenkins issue causing a failure, but I tested the
> functionality and it works well and looks good. Before we land this I'd like
> to understand the impact on memory this has to make sure it is acceptable. And
> I have a few other questions..
>
> Specifically:
> - roughly what is the memory usage associated with generating and loading each
> thumbnail
> - how can we limit the thumbnail cache as this seems it will grow limitlessly
> as history grows. We probably need some sort of hard limit on disk size or
> number stored so we don't chew up the users disk space. And a way to recreate
> if one from the cache doesn't exist.
> - Are all thumbnails for the history items loaded in memory when the browser
> is started?
> - Or do we only load thumbnails for images that are visible on the screen? I
> hope so :)
>
> We should ensure that if you have hundreds/thousands of history items (which
> is likely) that we're not creating and loading thumbnails for all of these up
> front but only on demand.

As the timeline view is using nested list views, delegates are created on demand only when needed, and so are images loaded. I haven’t done any specific memory measurements, but I expect the memory consumption related to thumbnails to remain very reasonable (the thumbnails are square PNG images 12×12 grid units), and especially on a small screen such as a phone, where very few delegates are visible at any given time.
We’re not even loading any thumbnail when the application starts, as the timeline view isn’t visible yet, so it doesn’t instantiate any delegate.

Limiting the size of the cache is indeed a problem which this branch doesn’t address at all. I guess we could define a size limit, and when that limit is reached do some cleanup by removing the oldest thumbnails.

There’s also one issue that this branch doesn’t address: if a thumbnail already exists for a page, it’s never going to be re-generated, even if the contents of the page change. An option would be to force re-generating the thumbnail if it’s older than a given interval, e.g. one week.

I believe those two issues can (should) be addressed in other branches.

[Bill Filler (bfiller)]

Sounds reasonable. Can you file bugs for those two issues please so we can track? I'll approve this but you need to fix the jenks failure before it can land.

review: Approve

[Olivier Tilloy (osomon)]

The jenkins failures are due to bug #1199662, a regression in the UITK, which has been fixed yesterday, I’ll trigger a re-build now.
As soon as this is merged I’ll file bugs to track those two issues. Thanks for the review!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:206
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/198/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1030
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/81
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/81/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1034
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1034/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/884

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/198/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/thumbnails]

207. By Olivier Tilloy on 2013-07-12

Fix autopilot tests.

[Olivier Tilloy (osomon)]

Some of the failures were actually a bug in the tests, this should now be fixed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:207
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/199/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1032
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1036
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1036/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/886

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/199/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

> As soon as this is merged I’ll file bugs to track those two issues.

Filed bug #1200525 (Thumbnails are never updated) and bug #1200526 (The thumbnail cache grows forever).

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-06-05 07:55:27 +0000
+++ CMakeLists.txt	2013-07-12 06:47:24 +0000
@@ -13,8 +13,6 @@
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5Quick REQUIRED)
 
-add_definitions(-DQT_NO_KEYWORDS)
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 
 
=== modified file 'debian/control'
--- debian/control	2013-07-09 09:55:10 +0000
+++ debian/control	2013-07-12 06:47:24 +0000
@@ -6,11 +6,15 @@
                debhelper (>= 9),
                dh-translations,
                python,
+               libqt5sql5-sqlite,
+               libqt5v8-5-private-dev,
+               libqt5webkit5-dev,
                qt5-default,
                qt5-qmake,
                qtbase5-dev,
+               qtbase5-private-dev,
                qtdeclarative5-dev,
-               libqt5sql5-sqlite,
+               qtdeclarative5-private-dev,
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-test-plugin,
                qtdeclarative5-ubuntu-ui-toolkit-plugin,
 
=== modified file 'src/Ubuntu/Components/Extras/Browser/CMakeLists.txt'
--- src/Ubuntu/Components/Extras/Browser/CMakeLists.txt	2013-07-03 12:00:08 +0000
+++ src/Ubuntu/Components/Extras/Browser/CMakeLists.txt	2013-07-12 06:47:24 +0000
@@ -9,12 +9,24 @@
     history-host-model.cpp
     history-hostlist-model.cpp
     tabs-model.cpp
+    webthumbnail-utils.cpp
+    webthumbnail-provider.cpp
+    webview-thumbnailer.cpp
     plugin.cpp
 )
 
 add_library(${PLUGIN} MODULE ${PLUGIN_SRC})
 
-qt5_use_modules(${PLUGIN} Core Qml Sql)
+qt5_use_modules(${PLUGIN} Core Qml Quick Sql WebKit)
+
+# work around the lack of a public cmake module for Qt5V8
+set(Qt5V8_PRIVATE_INCLUDE_DIRS
+    "/usr/include/qt5/QtV8/${Qt5Qml_VERSION_STRING}"
+    "/usr/include/qt5/QtV8/${Qt5Qml_VERSION_STRING}/QtV8")
+include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}
+                    ${Qt5V8_PRIVATE_INCLUDE_DIRS}
+                    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
+                    ${Qt5WebKit_PRIVATE_INCLUDE_DIRS})
 
 file(GLOB QML_FILES *.qml qmldir *.js)
 install(TARGETS ${PLUGIN} DESTINATION ${WEBBROWSER_IMPORTS_DIR})
 
=== modified file 'src/Ubuntu/Components/Extras/Browser/PageDelegate.qml'
--- src/Ubuntu/Components/Extras/Browser/PageDelegate.qml	2013-06-05 11:06:28 +0000
+++ src/Ubuntu/Components/Extras/Browser/PageDelegate.qml	2013-07-12 06:47:24 +0000
@@ -19,17 +19,34 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 
-UbuntuShape {
-    property alias title: title.text
+Item {
+    property alias thumbnail: thumbnail.source
+    property alias label: label.text
+
+    UbuntuShape {
+        id: shape
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
+        height: width
+
+        image: Image {
+            id: thumbnail
+        }
+    }
 
     Label {
-        id: title
+        id: label
         anchors {
-            fill: parent
-            margins: units.gu(0.5)
+            top: shape.bottom
+            topMargin: units.gu(1)
+            left: parent.left
+            right: parent.right
         }
+        height: units.gu(1)
         fontSize: "small"
-        wrapMode: Text.Wrap
         elide: Text.ElideRight
     }
 }
 
=== modified file 'src/Ubuntu/Components/Extras/Browser/TabsList.qml'
--- src/Ubuntu/Components/Extras/Browser/TabsList.qml	2013-07-09 05:55:49 +0000
+++ src/Ubuntu/Components/Extras/Browser/TabsList.qml	2013-07-12 06:47:24 +0000
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2013 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
@@ -41,7 +41,7 @@
             right: parent.right
             margins: units.gu(2)
         }
-        height: units.gu(14)
+        height: units.gu(16)
         spacing: units.gu(2)
         orientation: ListView.Horizontal
         currentIndex: model.currentIndex
@@ -50,7 +50,7 @@
             width: units.gu(14)
             height: parent.height
 
-            PageDelegate {
+            UbuntuShape {
                 objectName: "newTabDelegate"
                 width: units.gu(12)
                 height: units.gu(12)
@@ -69,7 +69,7 @@
 
         delegate: ListItem.Empty {
             width: units.gu(12)
-            height: units.gu(12)
+            height: units.gu(14)
             showDivider: false
 
             // FIXME: http://pad.lv/1187476 makes it impossible to swipe a
@@ -78,10 +78,12 @@
             onItemRemoved: tabRemoved(index)
 
             PageDelegate {
+                id: openTabDelegate
                 objectName: "openTabDelegate"
                 anchors.fill: parent
-                color: (index == currentIndex) ? UbuntuColors.darkAubergine : "white"
-                title: model.title
+
+                label: model.url
+                thumbnail: model.webview.thumbnail
             }
 
             onClicked: switchToTabClicked(index)
 
=== modified file 'src/Ubuntu/Components/Extras/Browser/TimelineView.qml'
--- src/Ubuntu/Components/Extras/Browser/TimelineView.qml	2013-07-05 14:37:29 +0000
+++ src/Ubuntu/Components/Extras/Browser/TimelineView.qml	2013-07-12 06:47:24 +0000
@@ -57,7 +57,7 @@
 
         header: TabsList {
             width: parent.width
-            height: units.gu(20)
+            height: units.gu(23)
 
             model: tabsModel
 
@@ -107,7 +107,7 @@
                     right: parent.right
                     margins: units.gu(2)
                 }
-                height: units.gu(12)
+                height: units.gu(14)
 
                 spacing: units.gu(2)
                 orientation: ListView.Horizontal
@@ -160,10 +160,10 @@
 
                 delegate: PageDelegate {
                     width: units.gu(12)
-                    height: units.gu(12)
-                    color: "white"
+                    height: units.gu(14)
 
-                    title: model.host ? model.host : i18n.tr("(local files)")
+                    label: model.host ? model.host : i18n.tr("(local files)")
+                    thumbnail: model.thumbnail
 
                     MouseArea {
                         anchors.fill: parent
@@ -196,10 +196,12 @@
 
                 delegate: PageDelegate {
                     width: units.gu(12)
-                    height: units.gu(12)
-                    color: "white"
-
-                    title: model.title
+                    height: units.gu(14)
+
+                    label: model.title ? model.title : model.url
+
+                    property url thumbnailSource: "image://webthumbnail/" + model.url
+                    thumbnail: WebThumbnailer.thumbnailExists(model.url) ? thumbnailSource : ""
 
                     MouseArea {
                         anchors.fill: parent
@@ -213,7 +215,8 @@
                         when: timelineIndex == timeline.currentIndex
                         PropertyChanges {
                             target: entriesView
-                            height: units.gu(12)
+                            height: units.gu(14)
+                            clip: false
                         }
                     }
                 ]
 
=== modified file 'src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml'
--- src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml	2013-06-13 08:36:55 +0000
+++ src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml	2013-07-12 06:47:24 +0000
@@ -21,6 +21,7 @@
 import QtWebKit 3.0
 import QtWebKit.experimental 1.0
 import Ubuntu.Components 0.1
+import Ubuntu.Components.Extras.Browser 0.1
 import Ubuntu.Components.Popups 0.1
 
 WebView {
@@ -187,4 +188,24 @@
         flickableItem: _webview
         align: Qt.AlignBottom
     }
+
+    WebviewThumbnailer {
+        id: thumbnailer
+        webview: _webview
+        targetSize: Qt.size(units.gu(12), units.gu(12))
+        property url thumbnailSource: "image://webthumbnail/" + _webview.url
+        onThumbnailRendered: {
+            if (url == _webview.url) {
+                _webview.thumbnail = thumbnailer.thumbnailSource
+            }
+        }
+    }
+    property url thumbnail: (url && thumbnailer.thumbnailExists()) ? thumbnailer.thumbnailSource : ""
+    onLoadingChanged: {
+        if (loadRequest.status === WebView.LoadSucceededStatus) {
+            if (!thumbnailer.thumbnailExists()) {
+                thumbnailer.renderThumbnail()
+            }
+        }
+    }
 }
 
=== modified file 'src/Ubuntu/Components/Extras/Browser/history-hostlist-model.cpp'
--- src/Ubuntu/Components/Extras/Browser/history-hostlist-model.cpp	2013-06-19 14:45:49 +0000
+++ src/Ubuntu/Components/Extras/Browser/history-hostlist-model.cpp	2013-07-12 06:47:24 +0000
@@ -20,6 +20,7 @@
 #include "history-model.h"
 #include "history-host-model.h"
 #include "history-timeframe-model.h"
+#include "webthumbnail-utils.h"
 
 // Qt
 #include <QtCore/QSet>
@@ -30,8 +31,9 @@
     \brief List model that exposes history entries grouped by host
 
     HistoryHostListModel is a list model that exposes history entries from a
-    HistoryTimeframeModel grouped by host. Each item in the list has two roles:
-    'host' for the host name, and 'entries' for the corresponding
+    HistoryTimeframeModel grouped by host. Each item in the list has three
+    roles: 'host' for the host name, 'thumbnail' for a thumbnail picture of a
+    page corresponding to this host, and 'entries' for the corresponding
     HistoryHostModel that contains all entries in this group.
 */
 HistoryHostListModel::HistoryHostListModel(QObject* parent)
@@ -50,6 +52,7 @@
     static QHash<int, QByteArray> roles;
     if (roles.isEmpty()) {
         roles[Host] = "host";
+        roles[Thumbnail] = "thumbnail";
         roles[Entries] = "entries";
     }
     return roles;
@@ -74,6 +77,20 @@
     switch (role) {
     case Host:
         return host;
+    case Thumbnail:
+    {
+        // Iterate over all the entries, and return the first valid thumbnail.
+        HistoryHostModel* entries = m_hosts.value(host);
+        int count = entries->rowCount();
+        for (int i = 0; i < count; ++i) {
+            QUrl url = entries->data(entries->index(i, 0), HistoryModel::Url).toUrl();
+            QFileInfo thumbnailFile = WebThumbnailUtils::thumbnailFile(url);
+            if (thumbnailFile.exists()) {
+                return thumbnailFile.absoluteFilePath();
+            }
+        }
+        return QUrl();
+    }
     case Entries:
         return QVariant::fromValue(m_hosts.value(host));
     default:
@@ -130,6 +147,7 @@
 
 void HistoryHostListModel::onRowsInserted(const QModelIndex& parent, int start, int end)
 {
+    QStringList updated;
     for (int i = start; i <= end; ++i) {
         QString host = getHostFromSourceModel(m_sourceModel->index(i, 0, parent));
         if (!m_hosts.contains(host)) {
@@ -144,8 +162,16 @@
             beginInsertRows(QModelIndex(), insertAt, insertAt);
             insertNewHost(host);
             endInsertRows();
+        } else {
+            updated.append(host);
         }
     }
+    QVector<int> updatedRoles = QVector<int>() << Thumbnail << Entries;
+    QStringList hosts = m_hosts.keys();
+    Q_FOREACH(const QString& host, updated) {
+        QModelIndex index = this->index(hosts.indexOf(host), 0);
+        Q_EMIT dataChanged(index, index, updatedRoles);
+    }
 }
 
 void HistoryHostListModel::onRowsRemoved(const QModelIndex& parent, int start, int end)
@@ -166,6 +192,11 @@
         delete m_hosts.take(host);
         endRemoveRows();
     }
+    // XXX: unfortunately there is no way to get a list of hosts that had some
+    // (but not all) entries removed. To ensure the views are correctly updated,
+    // let’s emit the signal for all entries, even those that haven’t changed.
+    Q_EMIT dataChanged(this->index(0, 0), this->index(rowCount() - 1, 0),
+                       QVector<int>() << Thumbnail << Entries);
 }
 
 void HistoryHostListModel::onModelReset()
 
=== modified file 'src/Ubuntu/Components/Extras/Browser/history-hostlist-model.h'
--- src/Ubuntu/Components/Extras/Browser/history-hostlist-model.h	2013-06-19 14:45:49 +0000
+++ src/Ubuntu/Components/Extras/Browser/history-hostlist-model.h	2013-07-12 06:47:24 +0000
@@ -41,6 +41,7 @@
 
     enum Roles {
         Host = Qt::UserRole + 1,
+        Thumbnail,
         Entries
     };
 
 
=== modified file 'src/Ubuntu/Components/Extras/Browser/plugin.cpp'
--- src/Ubuntu/Components/Extras/Browser/plugin.cpp	2013-07-03 12:00:08 +0000
+++ src/Ubuntu/Components/Extras/Browser/plugin.cpp	2013-07-12 06:47:24 +0000
@@ -23,6 +23,8 @@
 #include "history-host-model.h"
 #include "history-hostlist-model.h"
 #include "tabs-model.h"
+#include "webthumbnail-provider.h"
+#include "webview-thumbnailer.h"
 
 // Qt
 #include <QtCore/QDir>
@@ -38,6 +40,10 @@
     }
     QQmlContext* context = engine->rootContext();
     context->setContextProperty("dataLocation", dataLocation.absolutePath());
+
+    WebThumbnailProvider* thumbnailer = new WebThumbnailProvider;
+    engine->addImageProvider(QLatin1String("webthumbnail"), thumbnailer);
+    context->setContextProperty("WebThumbnailer", thumbnailer);
 }
 
 void UbuntuBrowserPlugin::registerTypes(const char* uri)
@@ -49,4 +55,5 @@
     qmlRegisterType<HistoryHostModel>(uri, 0, 1, "HistoryHostModel");
     qmlRegisterType<HistoryHostListModel>(uri, 0, 1, "HistoryHostListModel");
     qmlRegisterType<TabsModel>(uri, 0, 1, "TabsModel");
+    qmlRegisterType<WebviewThumbnailer>(uri, 0, 1, "WebviewThumbnailer");
 }
 
=== modified file 'src/Ubuntu/Components/Extras/Browser/tabs-model.cpp'
--- src/Ubuntu/Components/Extras/Browser/tabs-model.cpp	2013-06-06 07:40:22 +0000
+++ src/Ubuntu/Components/Extras/Browser/tabs-model.cpp	2013-07-12 06:47:24 +0000
@@ -28,7 +28,7 @@
 
     TabsModel is a list model that stores the list of currently open tabs.
     Each tab holds a pointer to a WebView and associated metadata (URL, title,
-    icon, thumbnail).
+    icon).
 
     The model doesn’t own the WebView, so it is the responsibility of whoever
     adds a tab to instantiate the corresponding WebView, and to destroy it after
@@ -51,7 +51,6 @@
         roles[Url] = "url";
         roles[Title] = "title";
         roles[Icon] = "icon";
-        roles[Thumbnail] = "thumbnail";
         roles[WebView] = "webview";
     }
     return roles;
@@ -80,9 +79,6 @@
         return webview->property("title");
     case Icon:
         return webview->property("icon");
-    case Thumbnail:
-        // XXX: not implemented yet
-        return QVariant();
     case WebView:
         return QVariant::fromValue(webview);
     default:
 
=== modified file 'src/Ubuntu/Components/Extras/Browser/tabs-model.h'
--- src/Ubuntu/Components/Extras/Browser/tabs-model.h	2013-06-06 07:40:22 +0000
+++ src/Ubuntu/Components/Extras/Browser/tabs-model.h	2013-07-12 06:47:24 +0000
@@ -43,7 +43,6 @@
         Url = Qt::UserRole + 1,
         Title,
         Icon,
-        Thumbnail,
         WebView
     };
 
 
=== added file 'src/Ubuntu/Components/Extras/Browser/webthumbnail-provider.cpp'
--- src/Ubuntu/Components/Extras/Browser/webthumbnail-provider.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Extras/Browser/webthumbnail-provider.cpp	2013-07-12 06:47:24 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2013 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 "webthumbnail-provider.h"
+#include "webthumbnail-utils.h"
+
+// Qt
+#include <QtCore/QDebug>
+#include <QtGui/QImageReader>
+
+WebThumbnailProvider::WebThumbnailProvider(QObject* parent)
+    : QObject(parent)
+    , QQuickImageProvider(QQuickImageProvider::Image)
+{
+}
+
+QImage WebThumbnailProvider::requestImage(const QString& id, QSize* size, const QSize& requestedSize)
+{
+    QImage image;
+    QFileInfo cached = WebThumbnailUtils::thumbnailFile(QUrl(id));
+    if (cached.exists()) {
+        QImageReader reader(cached.absoluteFilePath(), "PNG");
+        if (requestedSize.isValid()) {
+            reader.setScaledSize(requestedSize);
+        }
+        *size = reader.size();
+        reader.read(&image);
+        if (image.isNull()) {
+            qWarning() << "Failed to load cached thumbnail:" << reader.errorString();
+        }
+    }
+    return image;
+}
+
+bool WebThumbnailProvider::thumbnailExists(const QUrl& url) const
+{
+    return WebThumbnailUtils::thumbnailFile(url).exists();
+}
 
=== added file 'src/Ubuntu/Components/Extras/Browser/webthumbnail-provider.h'
--- src/Ubuntu/Components/Extras/Browser/webthumbnail-provider.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Extras/Browser/webthumbnail-provider.h	2013-07-12 06:47:24 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2013 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 __WEBTHUMBNAIL_PROVIDER_H__
+#define __WEBTHUMBNAIL_PROVIDER_H__
+
+// Qt
+#include <QtCore/QObject>
+#include <QtCore/QUrl>
+#include <QtQuick/QQuickImageProvider>
+
+class WebThumbnailProvider : public QObject, public QQuickImageProvider
+{
+    Q_OBJECT
+
+public:
+    WebThumbnailProvider(QObject* parent=0);
+
+    virtual QImage requestImage(const QString& id, QSize* size, const QSize& requestedSize);
+
+    Q_INVOKABLE bool thumbnailExists(const QUrl& url) const;
+};
+
+#endif // __WEBTHUMBNAIL_PROVIDER_H__
 
=== added file 'src/Ubuntu/Components/Extras/Browser/webthumbnail-utils.cpp'
--- src/Ubuntu/Components/Extras/Browser/webthumbnail-utils.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Extras/Browser/webthumbnail-utils.cpp	2013-07-12 06:47:24 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2013 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 "webthumbnail-utils.h"
+
+// Qt
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QStandardPaths>
+
+QDir WebThumbnailUtils::cacheLocation()
+{
+    return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/thumbnails";
+}
+
+void WebThumbnailUtils::ensureCacheLocation()
+{
+    QDir cache = cacheLocation();
+    if (!cache.exists()) {
+        QDir::root().mkpath(cache.absolutePath());
+    }
+}
+
+QFileInfo WebThumbnailUtils::thumbnailFile(const QUrl& url)
+{
+    QString hash(QCryptographicHash::hash(url.toEncoded(), QCryptographicHash::Md5).toHex());
+    return cacheLocation().absoluteFilePath(hash + ".png");
+}
 
=== added file 'src/Ubuntu/Components/Extras/Browser/webthumbnail-utils.h'
--- src/Ubuntu/Components/Extras/Browser/webthumbnail-utils.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Extras/Browser/webthumbnail-utils.h	2013-07-12 06:47:24 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2013 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 __WEBTHUMBNAIL_UTILS_H__
+#define __WEBTHUMBNAIL_UTILS_H__
+
+// Qt
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QUrl>
+
+class WebThumbnailUtils
+{
+public:
+    static QDir cacheLocation();
+    static void ensureCacheLocation();
+    static QFileInfo thumbnailFile(const QUrl& url);
+};
+
+#endif // __WEBTHUMBNAIL_UTILS_H__
 
=== added file 'src/Ubuntu/Components/Extras/Browser/webview-thumbnailer.cpp'
--- src/Ubuntu/Components/Extras/Browser/webview-thumbnailer.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Extras/Browser/webview-thumbnailer.cpp	2013-07-12 06:47:24 +0000
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2013 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 "webview-thumbnailer.h"
+#include "webthumbnail-utils.h"
+
+// Qt
+#include <QtCore/QTimer>
+#include <QtQuick/private/qsgrenderer_p.h>
+#include <QtWebKit/private/qquickwebpage_p.h>
+#include <QtWebKit/private/qquickwebview_p.h>
+
+class BindableFbo : public QSGBindable
+{
+public:
+    BindableFbo(QOpenGLFramebufferObject* fbo) : m_fbo(fbo) {}
+    virtual void bind() const { m_fbo->bind(); }
+
+private:
+    QOpenGLFramebufferObject *m_fbo;
+};
+
+WebviewThumbnailer::WebviewThumbnailer(QQuickItem* parent)
+    : QQuickItem(parent)
+    , m_webview(0)
+    , m_renderer(0)
+{
+}
+
+WebviewThumbnailer::~WebviewThumbnailer()
+{
+    delete m_renderer;
+}
+
+QQuickWebView* WebviewThumbnailer::webview() const
+{
+    return m_webview;
+}
+
+void WebviewThumbnailer::setWebview(QQuickWebView* webview)
+{
+    if (webview != m_webview) {
+        m_webview = webview;
+        setFlag(QQuickItem::ItemHasContents, false);
+        Q_EMIT webviewChanged();
+    }
+}
+
+const QSize& WebviewThumbnailer::targetSize() const
+{
+    return m_targetSize;
+}
+
+void WebviewThumbnailer::setTargetSize(const QSize& targetSize)
+{
+    if (targetSize != m_targetSize) {
+        m_targetSize = targetSize;
+        Q_EMIT targetSizeChanged();
+    }
+}
+
+bool WebviewThumbnailer::thumbnailExists() const
+{
+    if (m_webview) {
+        QUrl url = m_webview->url();
+        if (url.isValid()) {
+            return WebThumbnailUtils::thumbnailFile(url).exists();
+        }
+    }
+    return false;
+}
+
+void WebviewThumbnailer::renderThumbnail()
+{
+    // Delay the actual rendering to give all elements on the page
+    // a chance to be fully rendered.
+    QTimer::singleShot(1000, this, SLOT(doRenderThumbnail()));
+}
+
+void WebviewThumbnailer::doRenderThumbnail()
+{
+    if (m_webview) {
+        setFlag(QQuickItem::ItemHasContents);
+        update();
+    }
+}
+
+QSGNode* WebviewThumbnailer::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* updatePaintNodeData)
+{
+    Q_UNUSED(updatePaintNodeData);
+
+    if (!(m_webview && (flags() & QQuickItem::ItemHasContents))) {
+        return oldNode;
+    }
+    setFlag(QQuickItem::ItemHasContents, false);
+
+    QQuickWebPage* page = m_webview->page();
+    qreal min = qMin(page->width(), page->height());
+    QSize size(min, min);
+
+    QSGNode* node = QQuickItemPrivate::get(page)->itemNode();
+    QSGNode* parent = node->QSGNode::parent();
+    QSGNode* previousSibling = node->previousSibling();
+    if (parent) {
+        parent->removeChildNode(node);
+    }
+    QSGRootNode root;
+    root.appendChildNode(node);
+
+    if (m_renderer == 0) {
+        m_renderer = QQuickItemPrivate::get(this)->sceneGraphContext()->createRenderer();
+    }
+    m_renderer->setRootNode(static_cast<QSGRootNode*>(&root));
+
+    QOpenGLFramebufferObject fbo(size);
+
+    m_renderer->setDeviceRect(size);
+    m_renderer->setViewportRect(size);
+    m_renderer->setProjectionMatrixToRect(QRectF(QPointF(), size));
+    m_renderer->setClearColor(Qt::transparent);
+
+    m_renderer->renderScene(BindableFbo(&fbo));
+
+    fbo.release();
+
+    QImage image = fbo.toImage().scaled(m_targetSize, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+
+    WebThumbnailUtils::ensureCacheLocation();
+    QUrl url = m_webview->url();
+    bool saved = image.save(WebThumbnailUtils::thumbnailFile(url).absoluteFilePath());
+
+    root.removeChildNode(node);
+
+    if (parent) {
+        if (previousSibling) {
+            parent->insertChildNodeAfter(node, previousSibling);
+        } else {
+            parent->prependChildNode(node);
+        }
+    }
+
+    if (saved) {
+        Q_EMIT thumbnailRendered(url);
+    }
+
+    return oldNode;
+}
 
=== added file 'src/Ubuntu/Components/Extras/Browser/webview-thumbnailer.h'
--- src/Ubuntu/Components/Extras/Browser/webview-thumbnailer.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Extras/Browser/webview-thumbnailer.h	2013-07-12 06:47:24 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2013 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 __WEBVIEW_THUMBNAILER_H__
+#define __WEBVIEW_THUMBNAILER_H__
+
+// Qt
+#include <QtCore/QSize>
+#include <QtCore/QUrl>
+#include <QtQuick/private/qquickitem_p.h>
+
+class QQuickWebView;
+class QSGRenderer;
+
+class WebviewThumbnailer : public QQuickItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QQuickWebView* webview READ webview WRITE setWebview NOTIFY webviewChanged)
+    Q_PROPERTY(QSize targetSize READ targetSize WRITE setTargetSize NOTIFY targetSizeChanged)
+
+public:
+    WebviewThumbnailer(QQuickItem* parent=0);
+    ~WebviewThumbnailer();
+
+    QQuickWebView* webview() const;
+    void setWebview(QQuickWebView* webview);
+
+    const QSize& targetSize() const;
+    void setTargetSize(const QSize& targetSize);
+
+    Q_INVOKABLE bool thumbnailExists() const;
+    Q_INVOKABLE void renderThumbnail();
+
+Q_SIGNALS:
+    void webviewChanged() const;
+    void targetSizeChanged() const;
+    void thumbnailRendered(const QUrl& url) const;
+
+protected:
+    virtual QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* updatePaintNodeData);
+
+private Q_SLOTS:
+    void doRenderThumbnail();
+
+private:
+    QQuickWebView* m_webview;
+    QSize m_targetSize;
+    QSGRenderer* m_renderer;
+};
+
+#endif // __WEBVIEW_THUMBNAILER_H__
 
=== modified file 'tests/autopilot/webbrowser_app/emulators/main_window.py'
--- tests/autopilot/webbrowser_app/emulators/main_window.py	2013-07-05 11:21:52 +0000
+++ tests/autopilot/webbrowser_app/emulators/main_window.py	2013-07-12 06:47:24 +0000
@@ -79,7 +79,7 @@
         return self.get_activity_view().select_single("TabsList")
 
     def get_tabslist_newtab_delegate(self):
-        return self.get_tabslist().select_single("PageDelegate",
+        return self.get_tabslist().select_single("UbuntuShape",
                                                  objectName="newTabDelegate")
 
     def get_tabslist_view(self):
 
=== modified file 'tests/unittests/history-hostlist-model/CMakeLists.txt'
--- tests/unittests/history-hostlist-model/CMakeLists.txt	2013-07-02 11:29:03 +0000
+++ tests/unittests/history-hostlist-model/CMakeLists.txt	2013-07-12 06:47:24 +0000
@@ -4,6 +4,7 @@
     ${webbrowser-plugin_SOURCE_DIR}/history-hostlist-model.cpp
     ${webbrowser-plugin_SOURCE_DIR}/history-model.cpp
     ${webbrowser-plugin_SOURCE_DIR}/history-timeframe-model.cpp
+    ${webbrowser-plugin_SOURCE_DIR}/webthumbnail-utils.cpp
     tst_HistoryHostListModelTests.cpp
 )
 add_executable(${TEST} ${SOURCES})
 
=== modified file 'tests/unittests/history-hostlist-model/tst_HistoryHostListModelTests.cpp'
--- tests/unittests/history-hostlist-model/tst_HistoryHostListModelTests.cpp	2013-07-02 11:29:03 +0000
+++ tests/unittests/history-hostlist-model/tst_HistoryHostListModelTests.cpp	2013-07-12 06:47:24 +0000
@@ -60,52 +60,75 @@
 
     void shouldUpdateHostListWhenInsertingEntries()
     {
-        QSignalSpy spy(model, SIGNAL(rowsInserted(const QModelIndex&, int, int)));
+        QSignalSpy spyRowsInserted(model, SIGNAL(rowsInserted(const QModelIndex&, int, int)));
+        qRegisterMetaType<QVector<int> >();
+        QSignalSpy spyDataChanged(model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
 
         history->add(QUrl("http://example.org/"), "Example Domain", QUrl());
-        QCOMPARE(spy.count(), 1);
-        QList<QVariant> args = spy.takeFirst();
+        QVERIFY(spyDataChanged.isEmpty());
+        QCOMPARE(spyRowsInserted.count(), 1);
+        QList<QVariant> args = spyRowsInserted.takeFirst();
         QCOMPARE(args.at(1).toInt(), 0);
         QCOMPARE(args.at(2).toInt(), 0);
         QCOMPARE(model->rowCount(), 1);
         QCOMPARE(model->data(model->index(0, 0), HistoryHostListModel::Host).toString(), QString("example.org"));
 
         history->add(QUrl("http://example.com/"), "Example Domain", QUrl());
-        QCOMPARE(spy.count(), 1);
-        args = spy.takeFirst();
+        QVERIFY(spyDataChanged.isEmpty());
+        QCOMPARE(spyRowsInserted.count(), 1);
+        args = spyRowsInserted.takeFirst();
         QCOMPARE(args.at(1).toInt(), 0);
         QCOMPARE(args.at(2).toInt(), 0);
         QCOMPARE(model->rowCount(), 2);
         QCOMPARE(model->data(model->index(0, 0), HistoryHostListModel::Host).toString(), QString("example.com"));
 
         history->add(QUrl("http://example.org/test.html"), "Test page", QUrl());
-        QVERIFY(spy.isEmpty());
+        QVERIFY(spyRowsInserted.isEmpty());
+        QCOMPARE(spyDataChanged.count(), 1);
+        args = spyDataChanged.takeFirst();
+        QCOMPARE(args.at(0).toModelIndex().row(), 1);
+        QCOMPARE(args.at(1).toModelIndex().row(), 1);
         QCOMPARE(model->rowCount(), 2);
     }
 
     void shouldUpdateHostListWhenRemovingEntries()
     {
-        QSignalSpy spy(model, SIGNAL(rowsRemoved(const QModelIndex&, int, int)));
         history->add(QUrl("http://example.org/"), "Example Domain", QUrl());
         QTest::qWait(100);
         QDateTime t0 = QDateTime::currentDateTimeUtc();
         QTest::qWait(100);
         history->add(QUrl("http://example.com/"), "Example Domain", QUrl());
-        QCOMPARE(model->rowCount(), 2);
-
-        timeframe->setEnd(t0);
-        QCOMPARE(spy.count(), 1);
-        QList<QVariant> args = spy.takeFirst();
-        QCOMPARE(args.at(1).toInt(), 0);
-        QCOMPARE(args.at(2).toInt(), 0);
-        QCOMPARE(model->rowCount(), 1);
+        QTest::qWait(100);
+        QDateTime t1 = QDateTime::currentDateTimeUtc();
+        QTest::qWait(100);
+        history->add(QUrl("http://example.org/test"), "Example Domain", QUrl());
+        QCOMPARE(model->rowCount(), 2);
+
+        QSignalSpy spyRowsRemoved(model, SIGNAL(rowsRemoved(const QModelIndex&, int, int)));
+        qRegisterMetaType<QVector<int> >();
+        QSignalSpy spyDataChanged(model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
+
+        timeframe->setEnd(t1);
+        QVERIFY(spyRowsRemoved.isEmpty());
+        QVERIFY(!spyDataChanged.isEmpty());
+        QList<QVariant> args;
+        bool changed = false;
+        int expectedIndex = 1;
+        while(!changed && !spyDataChanged.isEmpty()) {
+            args = spyDataChanged.takeFirst();
+            int start = args.at(0).toModelIndex().row();
+            int end = args.at(1).toModelIndex().row();
+            changed = (start <= expectedIndex) && (expectedIndex <= end);
+        }
+        QVERIFY(changed);
+        QCOMPARE(model->rowCount(), 2);
 
         timeframe->setStart(t0);
-        QCOMPARE(spy.count(), 1);
-        args = spy.takeFirst();
-        QCOMPARE(args.at(1).toInt(), 0);
-        QCOMPARE(args.at(2).toInt(), 0);
-        QCOMPARE(model->rowCount(), 0);
+        QCOMPARE(spyRowsRemoved.count(), 1);
+        args = spyRowsRemoved.takeFirst();
+        QCOMPARE(args.at(1).toInt(), 1);
+        QCOMPARE(args.at(2).toInt(), 1);
+        QCOMPARE(model->rowCount(), 1);
     }
 
     void shouldUpdateWhenChangingSourceModel()