Merge lp:~osomon/webbrowser-app/domain-names-chronological into lp:webbrowser-app

[Olivier Tilloy]

Keep the list of domain names sorted in reverse chronological order
(i.e. the domain with the latest entry visited first).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:241
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/219/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1529
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/102
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/102/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1533
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1533/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1294

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

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

Code looks ok.
But when adding a domain, that is already in the "last month", it's not added to the "today" section.

And after launching the webbrowser again, I always get a crash:
schwann@carbon:~/Projects/manhattan/domain-names-chronological$ gdb src/webbrowser-app
GNU gdb (GDB) 7.5.91.20130417-cvs-ubuntu
Copyright (C) 2013 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law. Type "show copying"
and "show warranty" for details.
This GDB was configured as "x86_64-linux-gnu".
For bug reporting instructions, please see:
<http://www.gnu.org/software/gdb/bugs/>...
Reading symbols from /home/schwann/Projects/manhattan/domain-names-chronological/src/webbrowser-app...(no debugging symbols found)...done.
(gdb) run
Starting program: /home/schwann/Projects/manhattan/domain-names-chronological/src/webbrowser-app
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
[New Thread 0x7fffed124700 (LWP 674)]
[New Thread 0x7fffdf5c7700 (LWP 675)]
Fontconfig warning: "/etc/fonts/conf.d/50-user.conf", line 14: reading configurations from ~/.fonts.conf is deprecated.
[New Thread 0x7fffde2fc700 (LWP 676)]
[New Thread 0x7fffec041700 (LWP 677)]
[New Thread 0x7fffccccf700 (LWP 678)]

WARNING: This project is using the experimental QML API extensions for QtWebKit and is therefore tied to a specific QtWebKit release.
WARNING: The experimental API will change from version to version, or even be removed. You have been warned!

Program received signal SIGSEGV, Segmentation fault.
__memmove_ssse3_back () at ../sysdeps/x86_64/multiarch/memcpy-ssse3-back.S:97
97 ../sysdeps/x86_64/multiarch/memcpy-ssse3-back.S: No such file or directory.
(gdb) bt
#0 __memmove_ssse3_back () at ../sysdeps/x86_64/multiarch/memcpy-ssse3-back.S:97
#1 0x00007ffff79aa0bf in memmove (__len=<optimized out>, __src=<optimized out>, __dest=<optimized out>)
    at /usr/include/x86_64-linux-gnu/bits/string3.h:57
#2 QVector<int>::erase (this=this@entry=0x72fa10, abegin=<optimized out>, aend=<optimized out>)
    at ../../include/QtCore/../../src/corelib/tools/qvector.h:625
#3 0x00007ffff79a0666 in remove (n=<optimized out>, i=150994944, this=0x72fa10)
    at ../../include/QtCore/../../src/corelib/tools/qvector.h:369
#4 QSortFilterProxyModelPrivate::remove_proxy_interval (this=this@entry=0x723f70, source_to_proxy=..., proxy_to_source=...,
    proxy_start=150994944, proxy_end=<optimized out>, proxy_parent=..., orient=orient@entry=Qt::Vertical,
    emit_signal=emit_signal@entry=true) at itemmodels/qsortfilterproxymodel.cpp:577
#5 0x00007ffff79a2ca2 in QSortFilterProxyModelPrivate::remove_source_items (this=this@entry=0x723f70, source_to_proxy=...,
    proxy_to_source=..., source_items=..., source_parent=..., orient=orient@entry=Qt::Vertical, emit_signal=emit_signal@entry=true)
    at itemmodels/qsortfilterproxymodel.cpp:553
#6 0x00007ffff79a2f6f in QSortFilterProxyModelPrivate::source_items_about_to_be_removed (this=0x723f70, source_parent=..., start=...

review: Needs Fixing

[Olivier Tilloy (osomon)]

I’m not seeing the crash, however I can reproduce the issue that you’re pointing out with a domain already visited last month (or this year, or whenever in the past) not moving to today when visited again.

[Olivier Tilloy (osomon)]

> I’m not seeing the crash, however I can reproduce the issue that you’re
> pointing out with a domain already visited last month (or this year, or
> whenever in the past) not moving to today when visited again.

That said, this issue is already present in the trunk, so this is not a new regression.
If you don’t mind, I’ll file a bug report and tackle it separately.

[Olivier Tilloy (osomon)]

> > I’m not seeing the crash, however I can reproduce the issue that you’re
> > pointing out with a domain already visited last month (or this year, or
> > whenever in the past) not moving to today when visited again.
>
> That said, this issue is already present in the trunk, so this is not a new
> regression.
> If you don’t mind, I’ll file a bug report and tackle it separately.

I filed bug #1204875 to track this issue.

[Günter Schwann (schwann)]

On the Nexus 10 I get the following (not so useful backtrace):
phablet@ubuntu-phablet:~$ gdb webbrowser-app
GNU gdb (GDB) 7.5.91.20130417-cvs-ubuntu
Copyright (C) 2013 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law. Type "show copying"
and "show warranty" for details.
This GDB was configured as "arm-linux-gnueabihf".
For bug reporting instructions, please see:
<http://www.gnu.org/software/gdb/bugs/>...
Reading symbols from /usr/bin/webbrowser-app...(no debugging symbols found)...done.
(gdb) run --desktop_file_hint=/usr/share/applications/webbrowser-app.desktop
Starting program: /usr/bin/webbrowser-app --desktop_file_hint=/usr/share/applications/webbrowser-app.desktop
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/arm-linux-gnueabihf/libthread_db.so.1".
__pthread_gettid -2
[New Thread 0xb3363460 (LWP 5458)]
[New Thread 0xb2b63460 (LWP 5459)]
[New Thread 0xb2363460 (LWP 5460)]
[New Thread 0xb1b63460 (LWP 5461)]
[New Thread 0xb1363460 (LWP 5462)]
[New Thread 0xb0b63460 (LWP 5463)]
loaded the dummy plugin
loaded the Linux plugin
Registered the AalSensorPlugin types

[New Thread 0xb0225460 (LWP 5464)]
[New Thread 0xaf7ff460 (LWP 5465)]
[New Thread 0xaf958460 (LWP 5466)]
[New Thread 0xad454460 (LWP 5467)]

WARNING: This project is using the experimental QML API extensions for QtWebKit and is therefore tied to a specific QtWebKit release.
WARNING: The experimental API will change from version to version, or even be removed. You have been warned!

[New Thread 0xac9ff460 (LWP 5468)]
[New Thread 0xac08d460 (LWP 5469)]
[New Thread 0xab88d460 (LWP 5470)]
[New Thread 0xaaf6d460 (LWP 5471)]
[New Thread 0xaa76d460 (LWP 5472)]
[New Thread 0xa9f6d460 (LWP 5473)]
callbacks 0xb456b499 0xb456b49d
[New Thread 0xa976d460 (LWP 5475)]
[New Thread 0xa8f6d460 (LWP 5476)]
[New Thread 0xa876d460 (LWP 5477)]
creating surface at (0, 64) with size (2560, 1536)[New Thread 0xa7067460 (LWP 5478)]
[New Thread 0xa6827460 (LWP 5479)]
__pthread_gettid -2
loaded the dummy plugin
loaded the Linux plugin
Registered the AalSensorPlugin types

QSortFilterProxyModel: inconsistent changes reported by source model
QSortFilterProxyModel: inconsistent changes reported by source model
*** Error in `/usr/bin/webbrowser-app': double free or corruption (!prev): 0x0036db80 ***

Program received signal SIGABRT, Aborted.
0xb6142706 in ?? () from /lib/arm-linux-gnueabihf/libc.so.6
(gdb) bt
#0 0xb6142706 in ?? () from /lib/arm-linux-gnueabihf/libc.so.6
#1 0xb61505fe in raise () from /lib/arm-linux-gnueabihf/libc.so.6
#2 0xb6152e1a in abort () from /lib/arm-linux-gnueabihf/libc.so.6
#3 0xb61769ec in ?? () from /lib/arm-linux-gnueabihf/libc.so.6
#4 0xb61769ec in ?? () from /lib/arm-linux-gnueabihf/libc.so.6
Backtrace stopped: previous frame identical to this frame (corrupt stack?)

[Olivier Tilloy (osomon)]

I am now able to reproduce the crash on my desktop machine with the history.sqlite database provided by Günter, and when running in a saucy chroot (can’t reproduce the crash on raring, which is what my desktop is running at the moment).

[Olivier Tilloy (osomon)]

Looks like the URL that triggers the crash is the following one:

    http://derstandard.at/1369363282846/Tuerkische-Spezialpolizei-stuermt-Protestcamp-auf-dem-Istanbuler-Taksim-Platz

The title of the page is:

    Proteste in der Türkei: Erdogan dankt Polizei für hartes Vorgehen gegen Demonstranten - Istanbuler Taksim-Platz gestürmt - Türkei - derStandard.at › International

I’m suspecting some sort of unicode issue, although I haven’t observed the issue before with accentuated characters…

[Olivier Tilloy (osomon)]

Looks like the title is not the culprit, I’ve removed it from the entry (set it to ""), and I’m still getting the crash.

[Olivier Tilloy (osomon)]

So the URL seems to be the culprit, and shortening it makes the crash go away, but I don’t know why (yet).

With this URL, I always observe the crash:

    http://derstandard.at/1369363282846/Tuerkische-Spezialpolizei-stuermt-Protestcamp-auf-dem

Whereas with this one, it doesn’t crash:

    http://derstandard.at/1369363282846/Tuerkische-Spezialpolizei-stuermt-Protestcamp

Note that I can reliably reproduce with the trunk version of the browser, so this isn’t linked to this branch.

[Günter Schwann (schwann)]

as the issues are not related to that MR (as it seems), I approve it

review: Approve

=== modified file 'src/Ubuntu/Components/Extras/Browser/CMakeLists.txt'
--- src/Ubuntu/Components/Extras/Browser/CMakeLists.txt	2013-07-12 13:49:42 +0000
+++ src/Ubuntu/Components/Extras/Browser/CMakeLists.txt	2013-07-25 10:05:47 +0000
@@ -9,6 +9,7 @@
     history-timeframe-model.cpp
     history-domain-model.cpp
     history-domainlist-model.cpp
+    history-domainlist-chronological-model.cpp
     tabs-model.cpp
     webthumbnail-utils.cpp
     webthumbnail-provider.cpp

=== modified file 'src/Ubuntu/Components/Extras/Browser/TimelineView.qml'
--- src/Ubuntu/Components/Extras/Browser/TimelineView.qml	2013-07-12 13:49:42 +0000
+++ src/Ubuntu/Components/Extras/Browser/TimelineView.qml	2013-07-25 10:05:47 +0000
@@ -112,48 +112,50 @@
                 spacing: units.gu(2)
                 orientation: ListView.Horizontal
 
-                model: HistoryDomainListModel {
-                    sourceModel: HistoryTimeframeModel {
-                        sourceModel: historyModel
-                        start: {
-                            var date = new Date()
-                            if (model.timeframe == "yesterday") {
-                                date.setDate(date.getDate() - 1)
-                            } else if (model.timeframe == "last7days") {
-                                date.setDate(date.getDate() - 7)
-                            } else if (model.timeframe == "thismonth") {
-                                date.setDate(1)
-                            } else if (model.timeframe == "thisyear") {
-                                date.setMonth(0)
-                                date.setDate(1)
-                            } else if (model.timeframe == "older") {
-                                date.setFullYear(0, 0, 1)
-                            }
-                            date.setHours(0)
-                            date.setMinutes(0)
-                            date.setSeconds(0)
-                            date.setMilliseconds(0)
-                            return date
-                        }
-                        end: {
-                            var date = new Date()
-                            if (model.timeframe == "yesterday") {
-                                date.setDate(date.getDate() - 1)
-                            } else if (model.timeframe == "last7days") {
-                                date.setDate(date.getDate() - 2)
-                            } else if (model.timeframe == "thismonth") {
-                                date.setDate(date.getDate() - 8)
-                            } else if (model.timeframe == "thisyear") {
-                                date.setDate(0)
-                            } else if (model.timeframe == "older") {
-                                date.setMonth(0)
-                                date.setDate(0)
-                            }
-                            date.setHours(23)
-                            date.setMinutes(59)
-                            date.setSeconds(59)
-                            date.setMilliseconds(999)
-                            return date
+                model: HistoryDomainListChronologicalModel {
+                    sourceModel: HistoryDomainListModel {
+                        sourceModel: HistoryTimeframeModel {
+                            sourceModel: historyModel
+                            start: {
+                                var date = new Date()
+                                if (model.timeframe == "yesterday") {
+                                    date.setDate(date.getDate() - 1)
+                                } else if (model.timeframe == "last7days") {
+                                    date.setDate(date.getDate() - 7)
+                                } else if (model.timeframe == "thismonth") {
+                                    date.setDate(1)
+                                } else if (model.timeframe == "thisyear") {
+                                    date.setMonth(0)
+                                    date.setDate(1)
+                                } else if (model.timeframe == "older") {
+                                    date.setFullYear(0, 0, 1)
+                                }
+                                date.setHours(0)
+                                date.setMinutes(0)
+                                date.setSeconds(0)
+                                date.setMilliseconds(0)
+                                return date
+                            }
+                            end: {
+                                var date = new Date()
+                                if (model.timeframe == "yesterday") {
+                                    date.setDate(date.getDate() - 1)
+                                } else if (model.timeframe == "last7days") {
+                                    date.setDate(date.getDate() - 2)
+                                } else if (model.timeframe == "thismonth") {
+                                    date.setDate(date.getDate() - 8)
+                                } else if (model.timeframe == "thisyear") {
+                                    date.setDate(0)
+                                } else if (model.timeframe == "older") {
+                                    date.setMonth(0)
+                                    date.setDate(0)
+                                }
+                                date.setHours(23)
+                                date.setMinutes(59)
+                                date.setSeconds(59)
+                                date.setMilliseconds(999)
+                                return date
+                            }
                         }
                     }
                 }

=== added file 'src/Ubuntu/Components/Extras/Browser/history-domainlist-chronological-model.cpp'
--- src/Ubuntu/Components/Extras/Browser/history-domainlist-chronological-model.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Extras/Browser/history-domainlist-chronological-model.cpp	2013-07-25 10:05:47 +0000
@@ -0,0 +1,50 @@
+/*
+ * 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 "history-domainlist-chronological-model.h"
+#include "history-domainlist-model.h"
+
+/*!
+    \class HistoryDomainListChronologicalModel
+    \brief Proxy model that sorts a domain list model in reverse chronological
+           order
+
+    HistoryDomainListChronologicalModel is a proxy model that sorts a
+    HistoryDomainListModel in reverse chronological order
+    (i.e. the domain with the latest entry visited first).
+*/
+HistoryDomainListChronologicalModel::HistoryDomainListChronologicalModel(QObject* parent)
+    : QSortFilterProxyModel(parent)
+{
+    setDynamicSortFilter(true);
+    setSortRole(HistoryDomainListModel::LastVisit);
+    sort(0, Qt::DescendingOrder);
+}
+
+HistoryDomainListModel* HistoryDomainListChronologicalModel::sourceModel() const
+{
+    return qobject_cast<HistoryDomainListModel*>(QSortFilterProxyModel::sourceModel());
+}
+
+void HistoryDomainListChronologicalModel::setSourceModel(HistoryDomainListModel* sourceModel)
+{
+    if (sourceModel != this->sourceModel()) {
+        QSortFilterProxyModel::setSourceModel(sourceModel);
+        Q_EMIT sourceModelChanged();
+    }
+}

=== added file 'src/Ubuntu/Components/Extras/Browser/history-domainlist-chronological-model.h'
--- src/Ubuntu/Components/Extras/Browser/history-domainlist-chronological-model.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Extras/Browser/history-domainlist-chronological-model.h	2013-07-25 10:05:47 +0000
@@ -0,0 +1,43 @@
+/*
+ * 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 __HISTORY_DOMAINLIST_CHRONOLOGICAL_MODEL_H__
+#define __HISTORY_DOMAINLIST_CHRONOLOGICAL_MODEL_H__
+
+// Qt
+#include <QtCore/QSortFilterProxyModel>
+
+class HistoryDomainListModel;
+
+class HistoryDomainListChronologicalModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+    Q_PROPERTY(HistoryDomainListModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged)
+
+public:
+    HistoryDomainListChronologicalModel(QObject* parent=0);
+
+    HistoryDomainListModel* sourceModel() const;
+    void setSourceModel(HistoryDomainListModel* sourceModel);
+
+Q_SIGNALS:
+    void sourceModelChanged() const;
+};
+
+#endif // __HISTORY_DOMAINLIST_CHRONOLOGICAL_MODEL_H__

=== modified file 'src/Ubuntu/Components/Extras/Browser/history-domainlist-model.cpp'
--- src/Ubuntu/Components/Extras/Browser/history-domainlist-model.cpp	2013-07-17 21:54:25 +0000
+++ src/Ubuntu/Components/Extras/Browser/history-domainlist-model.cpp	2013-07-25 10:05:47 +0000
@@ -53,6 +53,7 @@
     static QHash<int, QByteArray> roles;
     if (roles.isEmpty()) {
         roles[Domain] = "domain";
+        roles[LastVisit] = "lastVisit";
         roles[Thumbnail] = "thumbnail";
         roles[Entries] = "entries";
     }
@@ -65,6 +66,13 @@
     return m_domains.count();
 }
 
+static void ensureEntriesUpToDate(HistoryDomainModel* entries)
+{
+    entries->blockSignals(true);
+    entries->invalidate();
+    entries->blockSignals(false);
+}
+
 QVariant HistoryDomainListModel::data(const QModelIndex& index, int role) const
 {
     if (!index.isValid()) {
@@ -75,13 +83,20 @@
         return QVariant();
     }
     const QString domain = m_domains.keys().at(row);
+    HistoryDomainModel* entries = m_domains.value(domain);
+
     switch (role) {
     case Domain:
         return domain;
+    case LastVisit:
+    {
+        ensureEntriesUpToDate(entries);
+        return entries->data(entries->index(0, 0), HistoryModel::LastVisit).toDateTime();
+    }
     case Thumbnail:
     {
         // Iterate over all the entries, and return the first valid thumbnail.
-        HistoryDomainModel* entries = m_domains.value(domain);
+        ensureEntriesUpToDate(entries);
         int count = entries->rowCount();
         for (int i = 0; i < count; ++i) {
             QUrl url = entries->data(entries->index(i, 0), HistoryModel::Url).toUrl();
@@ -93,7 +108,7 @@
         return QUrl();
     }
     case Entries:
-        return QVariant::fromValue(m_domains.value(domain));
+        return QVariant::fromValue(entries);
     default:
         return QVariant();
     }
@@ -117,12 +132,6 @@
         if (m_sourceModel != 0) {
             connect(m_sourceModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
                     SLOT(onRowsInserted(const QModelIndex&, int, int)));
-            connect(m_sourceModel, SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
-                    SLOT(onRowsRemoved(const QModelIndex&, int, int)));
-            connect(m_sourceModel, SIGNAL(layoutChanged(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint)),
-                    SLOT(onLayoutChanged(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint)));
-            connect(m_sourceModel, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)),
-                    SLOT(onDataChanged(QModelIndex,QModelIndex,QVector<int>)));
             connect(m_sourceModel, SIGNAL(modelReset()), SLOT(onModelReset()));
         }
         endResetModel();
@@ -152,7 +161,6 @@
 
 void HistoryDomainListModel::onRowsInserted(const QModelIndex& parent, int start, int end)
 {
-    QStringList updated;
     for (int i = start; i <= end; ++i) {
         QString domain = getDomainFromSourceModel(m_sourceModel->index(i, 0, parent));
         if (!m_domains.contains(domain)) {
@@ -167,64 +175,8 @@
             beginInsertRows(QModelIndex(), insertAt, insertAt);
             insertNewDomain(domain);
             endInsertRows();
-        } else {
-            updated.append(domain);
         }
     }
-    QVector<int> updatedRoles = QVector<int>() << Thumbnail << Entries;
-    QStringList domains = m_domains.keys();
-    Q_FOREACH(const QString& domain, updated) {
-        QModelIndex index = this->index(domains.indexOf(domain), 0);
-        Q_EMIT dataChanged(index, index, updatedRoles);
-    }
-}
-
-void HistoryDomainListModel::onRowsRemoved(const QModelIndex& parent, int start, int end)
-{
-    Q_UNUSED(parent);
-    Q_UNUSED(start);
-    Q_UNUSED(end);
-    QSet<QString> newDomains;
-    int count = m_sourceModel->rowCount();
-    for (int i = 0; i < count; ++i) {
-        newDomains.insert(getDomainFromSourceModel(m_sourceModel->index(i, 0)));
-    }
-    QSet<QString> removed = QSet<QString>::fromList(m_domains.keys());
-    removed.subtract(newDomains);
-    Q_FOREACH(const QString& domain, removed) {
-        int removeAt = m_domains.keys().indexOf(domain);
-        beginRemoveRows(QModelIndex(), removeAt, removeAt);
-        delete m_domains.take(domain);
-        endRemoveRows();
-    }
-    // XXX: unfortunately there is no way to get a list of domains 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 HistoryDomainListModel::onLayoutChanged(const QList<QPersistentModelIndex>& parents, QAbstractItemModel::LayoutChangeHint hint)
-{
-    Q_UNUSED(parents);
-    Q_UNUSED(hint);
-    Q_EMIT dataChanged(this->index(0, 0), this->index(rowCount() - 1, 0),
-                       QVector<int>() << Thumbnail << Entries);
-}
-
-void HistoryDomainListModel::onDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)
-{
-    Q_UNUSED(roles);
-    int start = topLeft.row();
-    int end = bottomRight.row();
-    QSet<QString> changed;
-    for (int i = start; i <= end; ++i) {
-        changed.insert(getDomainFromSourceModel(m_sourceModel->index(i, 0)));
-    }
-    Q_FOREACH(const QString& domain, changed) {
-        QModelIndex index = this->index(m_domains.keys().indexOf(domain), 0);
-        Q_EMIT dataChanged(index, index, QVector<int>() << Thumbnail << Entries);
-    }
 }
 
 void HistoryDomainListModel::onModelReset()
@@ -240,6 +192,17 @@
     HistoryDomainModel* model = new HistoryDomainModel(this);
     model->setSourceModel(m_sourceModel);
     model->setDomain(domain);
+    connect(model, SIGNAL(rowsInserted(QModelIndex, int, int)),
+            SLOT(onDomainRowsInserted(QModelIndex, int, int)));
+    connect(model, SIGNAL(rowsRemoved(QModelIndex, int, int)),
+            SLOT(onDomainRowsRemoved(QModelIndex, int, int)));
+    connect(model, SIGNAL(rowsMoved(QModelIndex, int, int, QModelIndex, int)),
+            SLOT(onDomainRowsMoved(QModelIndex, int, int, QModelIndex, int)));
+    connect(model, SIGNAL(layoutChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint)),
+            SLOT(onDomainLayoutChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint)));
+    connect(model, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
+            SLOT(onDomainDataChanged(QModelIndex, QModelIndex)));
+    connect(model, SIGNAL(modelReset()), SLOT(onDomainModelReset()));
     m_domains.insert(domain, model);
 }
 
@@ -248,3 +211,78 @@
     QUrl url = m_sourceModel->data(index, HistoryModel::Url).toUrl();
     return DomainUtils::extractTopLevelDomainName(url).toLower();
 }
+
+void HistoryDomainListModel::onDomainRowsInserted(const QModelIndex& parent, int start, int end)
+{
+    Q_UNUSED(parent);
+    Q_UNUSED(start);
+    Q_UNUSED(end);
+    HistoryDomainModel* model = qobject_cast<HistoryDomainModel*>(sender());
+    if (model != 0) {
+        emitDataChanged(model->domain());
+    }
+}
+
+void HistoryDomainListModel::onDomainRowsRemoved(const QModelIndex& parent, int start, int end)
+{
+    Q_UNUSED(parent);
+    Q_UNUSED(start);
+    Q_UNUSED(end);
+    HistoryDomainModel* model = qobject_cast<HistoryDomainModel*>(sender());
+    if (model != 0) {
+        const QString& domain = model->domain();
+        if (model->rowCount() == 0) {
+            int removeAt = m_domains.keys().indexOf(domain);
+            beginRemoveRows(QModelIndex(), removeAt, removeAt);
+            delete m_domains.take(domain);
+            endRemoveRows();
+        } else {
+            emitDataChanged(domain);
+        }
+    }
+}
+
+void HistoryDomainListModel::onDomainRowsMoved(const QModelIndex& sourceParent, int sourceStart, int sourceEnd, const QModelIndex& destinationParent, int destinationRow)
+{
+    HistoryDomainModel* model = qobject_cast<HistoryDomainModel*>(sender());
+    if (model != 0) {
+        emitDataChanged(model->domain());
+    }
+}
+
+void HistoryDomainListModel::onDomainLayoutChanged(const QList<QPersistentModelIndex>& parents, QAbstractItemModel::LayoutChangeHint hint)
+{
+    Q_UNUSED(parents);
+    Q_UNUSED(hint);
+    HistoryDomainModel* model = qobject_cast<HistoryDomainModel*>(sender());
+    if (model != 0) {
+        emitDataChanged(model->domain());
+    }
+}
+
+void HistoryDomainListModel::onDomainDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
+{
+    Q_UNUSED(topLeft);
+    Q_UNUSED(bottomRight);
+    HistoryDomainModel* model = qobject_cast<HistoryDomainModel*>(sender());
+    if (model != 0) {
+        emitDataChanged(model->domain());
+    }
+}
+
+void HistoryDomainListModel::onDomainModelReset()
+{
+    HistoryDomainModel* model = qobject_cast<HistoryDomainModel*>(sender());
+    if (model != 0) {
+        emitDataChanged(model->domain());
+    }
+}
+
+void HistoryDomainListModel::emitDataChanged(const QString& domain)
+{
+    int i = m_domains.keys().indexOf(domain);
+    if (i != -1) {
+        QModelIndex index = this->index(i, 0);
+        Q_EMIT dataChanged(index, index, QVector<int>() << LastVisit << Thumbnail << Entries);
+    }
+}

=== modified file 'src/Ubuntu/Components/Extras/Browser/history-domainlist-model.h'
--- src/Ubuntu/Components/Extras/Browser/history-domainlist-model.h	2013-07-17 07:55:51 +0000
+++ src/Ubuntu/Components/Extras/Browser/history-domainlist-model.h	2013-07-25 10:05:47 +0000
@@ -41,6 +41,7 @@
 
     enum Roles {
         Domain = Qt::UserRole + 1,
+        LastVisit,
         Thumbnail,
         Entries
     };
@@ -58,11 +59,15 @@
 
 private Q_SLOTS:
     void onRowsInserted(const QModelIndex& parent, int start, int end);
-    void onRowsRemoved(const QModelIndex& parent, int start, int end);
-    void onLayoutChanged(const QList<QPersistentModelIndex>& parents, QAbstractItemModel::LayoutChangeHint hint);
-    void onDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles);
     void onModelReset();
 
+    void onDomainRowsInserted(const QModelIndex& parent, int start, int end);
+    void onDomainRowsRemoved(const QModelIndex& parent, int start, int end);
+    void onDomainRowsMoved(const QModelIndex& sourceParent, int sourceStart, int sourceEnd, const QModelIndex& destinationParent, int destinationRow);
+    void onDomainLayoutChanged(const QList<QPersistentModelIndex>& parents, QAbstractItemModel::LayoutChangeHint hint);
+    void onDomainDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
+    void onDomainModelReset();
+
 private:
     HistoryTimeframeModel* m_sourceModel;
     QMap<QString, HistoryDomainModel*> m_domains;
@@ -71,6 +76,7 @@
     void populateModel();
     void insertNewDomain(const QString& domain);
     QString getDomainFromSourceModel(const QModelIndex& index) const;
+    void emitDataChanged(const QString& domain);
 };
 
 #endif // __HISTORY_DOMAINLIST_MODEL_H__

=== modified file 'src/Ubuntu/Components/Extras/Browser/plugin.cpp'
--- src/Ubuntu/Components/Extras/Browser/plugin.cpp	2013-07-12 13:49:42 +0000
+++ src/Ubuntu/Components/Extras/Browser/plugin.cpp	2013-07-25 10:05:47 +0000
@@ -22,6 +22,7 @@
 #include "history-timeframe-model.h"
 #include "history-domain-model.h"
 #include "history-domainlist-model.h"
+#include "history-domainlist-chronological-model.h"
 #include "tabs-model.h"
 #include "webthumbnail-provider.h"
 #include "webview-thumbnailer.h"
@@ -54,6 +55,7 @@
     qmlRegisterType<HistoryTimeframeModel>(uri, 0, 1, "HistoryTimeframeModel");
     qmlRegisterType<HistoryDomainModel>(uri, 0, 1, "HistoryDomainModel");
     qmlRegisterType<HistoryDomainListModel>(uri, 0, 1, "HistoryDomainListModel");
+    qmlRegisterType<HistoryDomainListChronologicalModel>(uri, 0, 1, "HistoryDomainListChronologicalModel");
     qmlRegisterType<TabsModel>(uri, 0, 1, "TabsModel");
     qmlRegisterType<WebviewThumbnailer>(uri, 0, 1, "WebviewThumbnailer");
 }

=== modified file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt	2013-07-12 13:49:42 +0000
+++ tests/unittests/CMakeLists.txt	2013-07-25 10:05:47 +0000
@@ -6,4 +6,5 @@
 add_subdirectory(history-timeframe-model)
 add_subdirectory(history-domain-model)
 add_subdirectory(history-domainlist-model)
+add_subdirectory(history-domainlist-chronological-model)
 add_subdirectory(tabs-model)

=== added directory 'tests/unittests/history-domainlist-chronological-model'
=== added file 'tests/unittests/history-domainlist-chronological-model/CMakeLists.txt'
--- tests/unittests/history-domainlist-chronological-model/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unittests/history-domainlist-chronological-model/CMakeLists.txt	2013-07-25 10:05:47 +0000
@@ -0,0 +1,15 @@
+set(TEST tst_HistoryDomainListChronologicalModelTests)
+set(SOURCES
+    ${webbrowser-plugin_SOURCE_DIR}/domain-utils.cpp
+    ${webbrowser-plugin_SOURCE_DIR}/history-domain-model.cpp
+    ${webbrowser-plugin_SOURCE_DIR}/history-domainlist-model.cpp
+    ${webbrowser-plugin_SOURCE_DIR}/history-domainlist-chronological-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_HistoryDomainListChronologicalModelTests.cpp
+)
+add_executable(${TEST} ${SOURCES})
+include_directories(${webbrowser-plugin_SOURCE_DIR})
+qt5_use_modules(${TEST} Core Sql Test)
+add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST})

=== added file 'tests/unittests/history-domainlist-chronological-model/tst_HistoryDomainListChronologicalModelTests.cpp'
--- tests/unittests/history-domainlist-chronological-model/tst_HistoryDomainListChronologicalModelTests.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittests/history-domainlist-chronological-model/tst_HistoryDomainListChronologicalModelTests.cpp	2013-07-25 10:05:47 +0000
@@ -0,0 +1,93 @@
+/*
+ * 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/>.
+ */
+
+// Qt
+#include <QtTest/QSignalSpy>
+#include <QtTest/QtTest>
+
+// local
+#include "domain-utils.h"
+#include "history-model.h"
+#include "history-domain-model.h"
+#include "history-domainlist-model.h"
+#include "history-domainlist-chronological-model.h"
+#include "history-timeframe-model.h"
+
+class HistoryDomainListChronologicalModelTests : public QObject
+{
+    Q_OBJECT
+
+private:
+    HistoryModel* history;
+    HistoryTimeframeModel* timeframe;
+    HistoryDomainListModel* domainlist;
+    HistoryDomainListChronologicalModel* model;
+
+private Q_SLOTS:
+    void init()
+    {
+        history = new HistoryModel;
+        history->setDatabasePath(":memory:");
+        timeframe = new HistoryTimeframeModel;
+        timeframe->setSourceModel(history);
+        domainlist = new HistoryDomainListModel;
+        domainlist->setSourceModel(timeframe);
+        model = new HistoryDomainListChronologicalModel;
+        model->setSourceModel(domainlist);
+    }
+
+    void cleanup()
+    {
+        delete model;
+        delete domainlist;
+        delete timeframe;
+        delete history;
+    }
+
+    void shouldBeInitiallyEmpty()
+    {
+        QCOMPARE(model->rowCount(), 0);
+    }
+
+    void shouldNotifyWhenChangingSourceModel()
+    {
+        QSignalSpy spy(model, SIGNAL(sourceModelChanged()));
+        model->setSourceModel(domainlist);
+        QVERIFY(spy.isEmpty());
+        HistoryDomainListModel* domainlist2 = new HistoryDomainListModel;
+        model->setSourceModel(domainlist2);
+        QCOMPARE(spy.count(), 1);
+        QCOMPARE(model->sourceModel(), domainlist2);
+        model->setSourceModel(0);
+        QCOMPARE(spy.count(), 2);
+        QCOMPARE(model->sourceModel(), (HistoryDomainListModel*) 0);
+        delete domainlist2;
+    }
+
+    void shouldRemainSorted()
+    {
+        history->add(QUrl("http://example.org/"), "Example Domain", QUrl());
+        QTest::qWait(1001);
+        history->add(QUrl("http://ubuntu.com/"), "Ubuntu", QUrl());
+        QCOMPARE(model->data(model->index(0, 0), HistoryDomainListModel::Domain).toString(), QString("ubuntu.com"));
+        QCOMPARE(model->data(model->index(1, 0), HistoryDomainListModel::Domain).toString(), QString("example.org"));
+    }
+};
+
+QTEST_MAIN(HistoryDomainListChronologicalModelTests)
+#include "tst_HistoryDomainListChronologicalModelTests.moc"

=== modified file 'tests/unittests/history-domainlist-model/tst_HistoryDomainListModelTests.cpp'
--- tests/unittests/history-domainlist-model/tst_HistoryDomainListModelTests.cpp	2013-07-17 07:55:51 +0000
+++ tests/unittests/history-domainlist-model/tst_HistoryDomainListModelTests.cpp	2013-07-25 10:05:47 +0000
@@ -156,13 +156,12 @@
     {
         history->add(QUrl("http://example.com/"), "Example Domain", QUrl());
         history->add(QUrl("http://example.org/"), "Example Domain", QUrl());
-        QTest::qWait(100);
 
         QSignalSpy spyRowsMoved(model, SIGNAL(rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int)));
         qRegisterMetaType<QVector<int> >();
         QSignalSpy spyDataChanged(model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
 
-        history->add(QUrl("http://example.org/"), "New Example Domain", QUrl());
+        history->add(QUrl("http://example.org/foobar"), "Example Domain", QUrl());
         QVERIFY(spyRowsMoved.isEmpty());
         QVERIFY(!spyDataChanged.isEmpty());
         verifyDataChanged(spyDataChanged, 1);