Merge lp:~osomon/oxide/navigation-api into lp:~oxide-developers/oxide/oxide.trunk

[Olivier Tilloy]

Implement a navigation API for the QML WebView.

[Chris Coulson (chrisccoulson)]

Thanks for working on this - it's looking good! I've just got a few initial comments:

- Do we need virtualUrl and titleForDisplay for anything? I'd be tempted to leave those out for now unless we've got a use-case for them.

- Technically, the code in the additional functions added to WebViewAdapterPrivate could all live in WebViewAdapter. The classes in qt/core/glue/private are only there so that we don't leak Chromium API's / types across a public interface, and also to provide a way of constructing objects from other parts of Oxide (see the text in qt/core/api/README, which is applicable here too). However, I've not been that disciplined in making it obvious where code should live, so it's ok as it is for now. I'll probably push some cleanup patches later on for everything in qt/core/glue.

Saying that, as those functions aren't Qt-specific, they could probably just go in oxide::WebView instead...

**************

+
+#include "oxideqquicknavigationhistory_p.h"
+#include "oxideqquicknavigationhistory_p_p.h"
+#include "oxideqquickwebview_p.h"
+
+#include <QDateTime>
+#include <QString>
+#include <QtAlgorithms>
+#include <QUrl>
+
+#include "qt/core/glue/oxide_qt_web_view_adapter.h"
+
+struct NavigationEntry {

Just a nit, but generally I've tried to follow the Google style guide when ordering headers (http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Names_and_Order_of_Includes), with the additional requirements of putting headers from shared/ before those in qt/ and listing headers from the same folder as the current object at the end. So I would order these like this:

#include "oxideqquicknavigationhistory_p.h"
#include "oxideqquicknavigationhistory_p_p.h"

#include <QDateTime>
#include <QString>
#include <QtAlgorithms>
#include <QUrl>

#include "qt/core/glue/oxide_qt_web_view_adapter.h"

#include "oxideqquickwebview_p.h"

I should write this down somewhere :)

**************

+OxideQQuickNavigationHistory::OxideQQuickNavigationHistory(
+ oxide::qt::WebViewAdapter* adapter, OxideQQuickWebView* webview) :
+ QAbstractListModel(webview),
+ d_ptr(new OxideQQuickNavigationHistoryPrivate) {
+ Q_D(OxideQQuickNavigationHistory);
+ d->q_ptr = this;

The "adapter" parameter in the constructor is not needed here, as there is a helper for getting this already from the public webview instance (OxideQQuickWebViewPrivate::get()).

**************

+void OxideQQuickNavigationHistory::onNavigationHistoryChanged() {
+ Q_D(OxideQQuickNavigationHistory);
+ Q_ASSERT(d->webview_adapter_ != NULL);
+
+ int newCount = d->webview_adapter_->getNavigationEntryCount();
+ if (newCount != d->entry_count_) {
+ beginResetModel();
+ d->entry_count_ = newCount;
+ for (int i = 0; i < newCount; ++i) {
+ int id = d->webview_adapter_->getNavigationEntryUniqueID(i);
+ NavigationEntry* entry;
+ if (d->entry_cache_.contains(id)) {
+ entry = d->entry_cache_.value(id);
+ } else {
+ entry = new NavigationEntry;
+ d->entry_cache_.insert(id, entry);
+ }
+ entry->url = d->webview_adapter_->getNavigationEntryUrl(i);
+ entry->virtualUrl = d->webview_adapter_->getNavigationEntryVirtualUrl(i);
+ ...

review: Needs Fixing

[lp:~osomon/oxide/navigation-api]

265. By Olivier Tilloy on 2013-12-02

Leave out virtualUrl and titleForDisplay for now, we don’t need them.

266. By Olivier Tilloy on 2013-12-02

#include re-ordering to be more consistent with the style of the existing code.

267. By Olivier Tilloy on 2013-12-02

Remove the unneeded "adapter" parameter.

268. By Olivier Tilloy on 2013-12-02

Issue a warning when trying to set the current index to an invalid value, and add corresponding tests.

269. By Olivier Tilloy on 2013-12-02

Add a bounds check for index.

270. By Olivier Tilloy on 2013-12-02

Remove trailing underscores from public members’ names.

271. By Olivier Tilloy on 2013-12-02

Move code that is not Qt-specific from qt/core/glue/private to shared/.

272. By Olivier Tilloy on 2013-12-02

Embed OxideQQuickNavigationHistory in the address space of OxideQQuickWebViewPrivate.

273. By Olivier Tilloy on 2013-12-02

Clear the entry cache when resetting the model.

[Olivier Tilloy (osomon)]

All remarks/suggestions addressed, but for this one:

> Does this work as expected when NavigationController prunes entries?
> For example, if there is a new navigation entry but
> NavigationController prunes one entry, then won't the model end up
> being out of date?

Not sure whether such a hypothetical case can ever happen, but if it did then as you point out the model would end up outdated.
In fact, onNavigationHistoryChanged is not enough to allow fine-grained updates of the model. To achieve that, I’ll need to implement a NotificationObserver that reacts to NOTIFICATION_NAV_LIST_PRUNED and NOTIFICATION_NAV_ENTRY_CHANGED, as well as implement WebContentsObserver::NavigationEntryCommitted() in oxide::WebView.
Does that make sense?

[lp:~osomon/oxide/navigation-api]

274. By Olivier Tilloy on 2013-12-03

Emit fine-grained notifications on oxide::WebView when the navigation history changes.

275. By Olivier Tilloy on 2013-12-03

Actually register to notifications.

276. By Olivier Tilloy on 2013-12-03

Hook to the navigation notifications on the Qt side.

277. By Olivier Tilloy on 2013-12-03

Update the navigation history model when notified that it changed.

278. By Olivier Tilloy on 2013-12-03

Discard notifications coming from other navigation controllers.

279. By Olivier Tilloy on 2013-12-04

Fix property type.

280. By Olivier Tilloy on 2013-12-04

Use tryCompare because the title is changed asynchronously.

281. By Olivier Tilloy on 2013-12-12

Implement WebContentsObserver::TitleWasSet to react to immediate title changes that are not notified otherwise.

[Olivier Tilloy (osomon)]

I just fixed the last remaining issue, this is now ready for review.

[lp:~osomon/oxide/navigation-api]

282. By Olivier Tilloy on 2013-12-17

Merge the latest changes from trunk.

283. By Olivier Tilloy on 2013-12-18

Instantiate the NotificationRegistrar only when initializing the WebView.

[Olivier Tilloy (osomon)]

Fixed to work with the latest trunk.

[Chris Coulson (chrisccoulson)]

This looks mostly ok now, but I don't understand why you made the change in r283 :)

[Olivier Tilloy (osomon)]

> This looks mostly ok now, but I don't understand why you made the change in
> r283 :)

After merging the latest changes from trunk (at revision 282), this code was consistently crashing at startup, because the registrar was instantiated at construction time, before the WebContents was assigned.

[Chris Coulson (chrisccoulson)]

Ok, that's fine. This is a result of http://bazaar.launchpad.net/~oxide-developers/oxide/oxide.trunk/revision/282, which requires that the browser components are started by a WebContext rather than a WebView.

Could you please change it to use a scoped_ptr though? Once that's done, feel free to merge it in. Thanks!

review: Approve

[lp:~osomon/oxide/navigation-api]

284. By Olivier Tilloy on 2014-01-07

Use a scoped_ptr instead of a plain pointer.

[Olivier Tilloy (osomon)]

> Could you please change it to use a scoped_ptr though?
> Once that's done, feel free to merge it in. Thanks!

Done, and merged. Thanks for the review!

=== modified file 'qt/core/glue/oxide_qt_web_view_adapter.cc'
--- qt/core/glue/oxide_qt_web_view_adapter.cc	2013-12-12 22:54:44 +0000
+++ qt/core/glue/oxide_qt_web_view_adapter.cc	2014-01-07 14:38:44 +0000
@@ -126,5 +126,33 @@
   return priv->web_contents() != NULL;
 }
 
+int WebViewAdapter::getNavigationEntryCount() const {
+  return priv->GetNavigationEntryCount();
+}
+
+int WebViewAdapter::getNavigationCurrentEntryIndex() const {
+  return priv->GetNavigationCurrentEntryIndex();
+}
+
+void WebViewAdapter::setNavigationCurrentEntryIndex(int index) {
+  priv->SetNavigationCurrentEntryIndex(index);
+}
+
+int WebViewAdapter::getNavigationEntryUniqueID(int index) const {
+  return priv->GetNavigationEntryUniqueID(index);
+}
+
+QUrl WebViewAdapter::getNavigationEntryUrl(int index) const {
+  return QUrl(QString::fromStdString(priv->GetNavigationEntryUrl(index).spec()));
+}
+
+QString WebViewAdapter::getNavigationEntryTitle(int index) const {
+  return QString::fromStdString(priv->GetNavigationEntryTitle(index));
+}
+
+QDateTime WebViewAdapter::getNavigationEntryTimestamp(int index) const {
+  return QDateTime::fromMSecsSinceEpoch(priv->GetNavigationEntryTimestamp(index).ToJsTime());
+}
+
 } // namespace qt
 } // namespace oxide

=== modified file 'qt/core/glue/oxide_qt_web_view_adapter.h'
--- qt/core/glue/oxide_qt_web_view_adapter.h	2013-12-16 12:18:07 +0000
+++ qt/core/glue/oxide_qt_web_view_adapter.h	2014-01-07 14:38:44 +0000
@@ -18,6 +18,7 @@
 #ifndef _OXIDE_QT_CORE_GLUE_WEB_VIEW_ADAPTER_H_
 #define _OXIDE_QT_CORE_GLUE_WEB_VIEW_ADAPTER_H_
 
+#include <QDateTime>
 #include <QList>
 #include <QRect>
 #include <QScopedPointer>
@@ -95,6 +96,10 @@
                           const QString& error_description) = 0;
   virtual void LoadSucceeded(const QUrl& url) = 0;
 
+  virtual void NavigationEntryCommitted() = 0;
+  virtual void NavigationListPruned(bool from_front, int count) = 0;
+  virtual void NavigationEntryChanged(int index) = 0;
+
   virtual WebFrameAdapter* CreateWebFrame() = 0;
 
   virtual QRect GetContainerBounds() = 0;
@@ -103,6 +108,14 @@
 
   bool isInitialized();
 
+  int getNavigationEntryCount() const;
+  int getNavigationCurrentEntryIndex() const;
+  void setNavigationCurrentEntryIndex(int index);
+  int getNavigationEntryUniqueID(int index) const;
+  QUrl getNavigationEntryUrl(int index) const;
+  QString getNavigationEntryTitle(int index) const;
+  QDateTime getNavigationEntryTimestamp(int index) const;
+
  protected:
   WebViewAdapter();
 

=== modified file 'qt/core/glue/private/oxide_qt_web_view_adapter_p.cc'
--- qt/core/glue/private/oxide_qt_web_view_adapter_p.cc	2013-12-16 12:18:07 +0000
+++ qt/core/glue/private/oxide_qt_web_view_adapter_p.cc	2014-01-07 14:38:44 +0000
@@ -77,6 +77,18 @@
   a->LoadSucceeded(QUrl(QString::fromStdString(validated_url.spec())));
 }
 
+void WebViewAdapterPrivate::OnNavigationEntryCommitted() {
+  a->NavigationEntryCommitted();
+}
+
+void WebViewAdapterPrivate::OnNavigationListPruned(bool from_front, int count) {
+  a->NavigationListPruned(from_front, count);
+}
+
+void WebViewAdapterPrivate::OnNavigationEntryChanged(int index) {
+  a->NavigationEntryChanged(index);
+}
+
 oxide::WebFrame* WebViewAdapterPrivate::CreateWebFrame() {
   return new WebFrame(a->CreateWebFrame());
 }

=== modified file 'qt/core/glue/private/oxide_qt_web_view_adapter_p.h'
--- qt/core/glue/private/oxide_qt_web_view_adapter_p.h	2013-12-16 12:18:07 +0000
+++ qt/core/glue/private/oxide_qt_web_view_adapter_p.h	2014-01-07 14:38:44 +0000
@@ -61,6 +61,10 @@
                     const std::string& error_description) FINAL;
   void OnLoadSucceeded(const GURL& validated_url) FINAL;
 
+  void OnNavigationEntryCommitted() FINAL;
+  void OnNavigationListPruned(bool from_front, int count) FINAL;
+  void OnNavigationEntryChanged(int index) FINAL;
+
   oxide::WebFrame* CreateWebFrame() FINAL;
 
   WebViewAdapter* a;

=== added file 'qt/quick/api/oxideqquicknavigationhistory.cc'
--- qt/quick/api/oxideqquicknavigationhistory.cc	1970-01-01 00:00:00 +0000
+++ qt/quick/api/oxideqquicknavigationhistory.cc	2014-01-07 14:38:44 +0000
@@ -0,0 +1,202 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2013 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library 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
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "oxideqquicknavigationhistory_p.h"
+#include "oxideqquicknavigationhistory_p_p.h"
+
+#include <QDateTime>
+#include <QDebug>
+#include <QSet>
+#include <QString>
+#include <QtAlgorithms>
+#include <QUrl>
+
+#include "oxideqquickwebview_p.h"
+#include "oxideqquickwebview_p_p.h"
+
+struct NavigationEntry {
+  QUrl url;
+  QString title;
+  QDateTime timestamp;
+};
+
+OxideQQuickNavigationHistory::OxideQQuickNavigationHistory(
+    OxideQQuickWebView* webview) :
+    QAbstractListModel(webview),
+    d_ptr(new OxideQQuickNavigationHistoryPrivate) {
+  Q_D(OxideQQuickNavigationHistory);
+  d->q_ptr = this;
+  d->webview = webview;
+  d->entry_count = 0;
+  d->current_index = -1;
+}
+
+OxideQQuickNavigationHistory::~OxideQQuickNavigationHistory() {
+  Q_D(OxideQQuickNavigationHistory);
+  qDeleteAll(d->entry_cache);
+  d->entry_cache.clear();
+}
+
+void OxideQQuickNavigationHistory::onNavigationEntryCommitted() {
+  Q_D(OxideQQuickNavigationHistory);
+
+  OxideQQuickWebViewPrivate* adapter = OxideQQuickWebViewPrivate::get(d->webview);
+  int newCount = adapter->getNavigationEntryCount();
+  int index = adapter->getNavigationCurrentEntryIndex();
+  if (newCount > d->entry_count) {
+    beginInsertRows(QModelIndex(), index, index);
+    d->entry_count = newCount;
+    int id = adapter->getNavigationEntryUniqueID(index);
+    if (!d->entry_cache.contains(id)) {
+      NavigationEntry* entry = new NavigationEntry;
+      d->entry_cache.insert(id, entry);
+      entry->url = adapter->getNavigationEntryUrl(index);
+      entry->title = adapter->getNavigationEntryTitle(index);
+      entry->timestamp = adapter->getNavigationEntryTimestamp(index);
+    }
+    endInsertRows();
+  }
+
+  if (index != d->current_index) {
+    d->current_index = index;
+    Q_EMIT currentIndexChanged();
+  }
+}
+
+void OxideQQuickNavigationHistory::onNavigationListPruned(bool from_front, int count) {
+  Q_D(OxideQQuickNavigationHistory);
+
+  int first;
+  if (from_front) {
+    first = 0;
+  } else {
+    first = d->entry_count - count;
+  }
+  int last = first + count - 1;
+  beginRemoveRows(QModelIndex(), first, last);
+  d->entry_count -= count;
+  endRemoveRows();
+
+  OxideQQuickWebViewPrivate* adapter = OxideQQuickWebViewPrivate::get(d->webview);
+  QSet<int> ids;
+  for (int i = 0; i < d->entry_count; ++i) {
+    ids.insert(adapter->getNavigationEntryUniqueID(i));
+  }
+  Q_FOREACH(int id, d->entry_cache.keys()) {
+    if (!ids.contains(id)) {
+      delete d->entry_cache.take(id);
+    }
+  }
+}
+
+void OxideQQuickNavigationHistory::onNavigationEntryChanged(int index) {
+  Q_D(OxideQQuickNavigationHistory);
+
+  OxideQQuickWebViewPrivate* adapter = OxideQQuickWebViewPrivate::get(d->webview);
+  int id = adapter->getNavigationEntryUniqueID(index);
+  NavigationEntry* entry;
+  if (d->entry_cache.contains(id)) {
+    entry = d->entry_cache.value(id);
+  } else {
+    entry = new NavigationEntry;
+    d->entry_cache.insert(id, entry);
+  }
+  QVector<int> roles;
+  QUrl url = adapter->getNavigationEntryUrl(index);
+  if (url != entry->url) {
+    entry->url = url;
+    roles.append(OxideQQuickNavigationHistoryPrivate::Url);
+  }
+  QString title = adapter->getNavigationEntryTitle(index);
+  if (title != entry->title) {
+    entry->title = title;
+    roles.append(OxideQQuickNavigationHistoryPrivate::Title);
+  }
+  QDateTime timestamp = adapter->getNavigationEntryTimestamp(index);
+  if (timestamp != entry->timestamp) {
+    entry->timestamp = timestamp;
+    roles.append(OxideQQuickNavigationHistoryPrivate::Timestamp);
+  }
+  if (!roles.isEmpty()) {
+    QModelIndex modelIndex = this->index(index, 0);
+    Q_EMIT dataChanged(modelIndex, modelIndex, roles);
+  }
+}
+
+int OxideQQuickNavigationHistory::currentIndex() const {
+  Q_D(const OxideQQuickNavigationHistory);
+  return d->current_index;
+}
+
+void OxideQQuickNavigationHistory::setCurrentIndex(int index) {
+  Q_D(OxideQQuickNavigationHistory);
+  if ((index < 0) || (index >= d->entry_count)) {
+    qWarning() << "Invalid index:" << index;
+    return;
+  }
+  if (index != d->current_index) {
+    d->current_index = index;
+    OxideQQuickWebViewPrivate* adapter = OxideQQuickWebViewPrivate::get(d->webview);
+    adapter->setNavigationCurrentEntryIndex(index);
+    Q_EMIT currentIndexChanged();
+  }
+}
+
+QHash<int, QByteArray> OxideQQuickNavigationHistory::roleNames() const {
+  static QHash<int, QByteArray> roles;
+  if (roles.isEmpty()) {
+    roles[OxideQQuickNavigationHistoryPrivate::Url] = "url";
+    roles[OxideQQuickNavigationHistoryPrivate::Title] = "title";
+    roles[OxideQQuickNavigationHistoryPrivate::Timestamp] = "timestamp";
+  }
+  return roles;
+}
+
+int OxideQQuickNavigationHistory::rowCount(const QModelIndex& parent) const {
+  Q_UNUSED(parent);
+  Q_D(const OxideQQuickNavigationHistory);
+  return d->entry_count;
+}
+
+QVariant OxideQQuickNavigationHistory::data(const QModelIndex& index, int role) const {
+  Q_D(const OxideQQuickNavigationHistory);
+  if (!index.isValid()) {
+    return QVariant();
+  }
+  int row = index.row();
+  if ((row < 0) || (row >= d->entry_count)) {
+    return QVariant();
+  }
+  OxideQQuickWebViewPrivate* adapter = OxideQQuickWebViewPrivate::get(d->webview);
+  int id = adapter->getNavigationEntryUniqueID(row);
+  NavigationEntry* entry;
+  if (d->entry_cache.contains(id)) {
+    entry = d->entry_cache.value(id);
+  } else {
+    return QVariant();
+  }
+  switch (role) {
+  case OxideQQuickNavigationHistoryPrivate::Url:
+    return entry->url;
+  case OxideQQuickNavigationHistoryPrivate::Title:
+    return entry->title;
+  case OxideQQuickNavigationHistoryPrivate::Timestamp:
+    return entry->timestamp;
+  default:
+    return QVariant();
+  }
+}

=== added file 'qt/quick/api/oxideqquicknavigationhistory_p.h'
--- qt/quick/api/oxideqquicknavigationhistory_p.h	1970-01-01 00:00:00 +0000
+++ qt/quick/api/oxideqquicknavigationhistory_p.h	2014-01-07 14:38:44 +0000
@@ -0,0 +1,67 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2013 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library 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
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_QT_QUICK_API_NAVIGATION_HISTORY_P_H_
+#define _OXIDE_QT_QUICK_API_NAVIGATION_HISTORY_P_H_
+
+#include <QAbstractListModel>
+#include <QScopedPointer>
+#include <QtQml>
+
+namespace oxide {
+namespace qt {
+class WebViewAdapter;
+}
+}
+
+class OxideQQuickNavigationHistoryPrivate;
+class OxideQQuickWebView;
+
+class OxideQQuickNavigationHistory : public QAbstractListModel {
+  Q_OBJECT
+  Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
+
+ public:
+  OxideQQuickNavigationHistory(OxideQQuickWebView* webview);
+  ~OxideQQuickNavigationHistory();
+
+  // reimplemented from QAbstractListModel
+  QHash<int, QByteArray> roleNames() const;
+  int rowCount(const QModelIndex& parent = QModelIndex()) const;
+  QVariant data(const QModelIndex& index, int role) const;
+
+  int currentIndex() const;
+  void setCurrentIndex(int index);
+
+Q_SIGNALS:
+  void currentIndexChanged();
+
+private Q_SLOTS:
+  friend class OxideQQuickWebViewPrivate;
+  void onNavigationEntryCommitted();
+  void onNavigationListPruned(bool from_front, int count);
+  void onNavigationEntryChanged(int index);
+
+private:
+  Q_DISABLE_COPY(OxideQQuickNavigationHistory)
+  QScopedPointer<OxideQQuickNavigationHistoryPrivate> d_ptr;
+  Q_DECLARE_PRIVATE(OxideQQuickNavigationHistory)
+};
+
+QML_DECLARE_TYPE(OxideQQuickNavigationHistory)
+
+#endif // _OXIDE_QT_QUICK_API_NAVIGATION_HISTORY_P_H_

=== added file 'qt/quick/api/oxideqquicknavigationhistory_p_p.h'
--- qt/quick/api/oxideqquicknavigationhistory_p_p.h	1970-01-01 00:00:00 +0000
+++ qt/quick/api/oxideqquicknavigationhistory_p_p.h	2014-01-07 14:38:44 +0000
@@ -0,0 +1,44 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2013 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library 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
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_QT_QUICK_API_NAVIGATION_HISTORY_P_P_H_
+#define _OXIDE_QT_QUICK_API_NAVIGATION_HISTORY_P_P_H_
+
+#include <QMap>
+
+class OxideQQuickNavigationHistory;
+class OxideQQuickWebView;
+
+struct NavigationEntry;
+
+class OxideQQuickNavigationHistoryPrivate {
+  Q_DECLARE_PUBLIC(OxideQQuickNavigationHistory)
+
+  enum Roles {
+    Url = Qt::UserRole + 1,
+    Title,
+    Timestamp
+  };
+
+  OxideQQuickNavigationHistory* q_ptr;
+  OxideQQuickWebView* webview;
+  int entry_count;
+  int current_index;
+  QMap<int, NavigationEntry*> entry_cache;
+};
+
+#endif // _OXIDE_QT_QUICK_API_NAVIGATION_HISTORY_P_P_H_

=== modified file 'qt/quick/api/oxideqquickwebview.cc'
--- qt/quick/api/oxideqquickwebview.cc	2013-12-19 12:37:21 +0000
+++ qt/quick/api/oxideqquickwebview.cc	2014-01-07 14:38:44 +0000
@@ -57,6 +57,7 @@
 OxideQQuickWebViewPrivate::OxideQQuickWebViewPrivate(
     OxideQQuickWebView* view) :
     context(NULL),
+    navigationHistory(view),
     popup_menu(NULL),
     init_props_(new InitData()),
     load_progress_(0),
@@ -148,6 +149,18 @@
   emit q->loadingChanged(&event);
 }
 
+void OxideQQuickWebViewPrivate::NavigationEntryCommitted() {
+  navigationHistory.onNavigationEntryCommitted();
+}
+
+void OxideQQuickWebViewPrivate::NavigationListPruned(bool from_front, int count) {
+  navigationHistory.onNavigationListPruned(from_front, count);
+}
+
+void OxideQQuickWebViewPrivate::NavigationEntryChanged(int index) {
+  navigationHistory.onNavigationEntryChanged(index);
+}
+
 oxide::qt::WebFrameAdapter* OxideQQuickWebViewPrivate::CreateWebFrame() {
   return OxideQQuickWebFramePrivate::get(new OxideQQuickWebFrame());
 }
@@ -466,6 +479,12 @@
   d->context = context;
 }
 
+OxideQQuickNavigationHistory* OxideQQuickWebView::navigationHistory() {
+  Q_D(OxideQQuickWebView);
+
+  return &d->navigationHistory;
+}
+
 // static
 OxideQQuickWebViewAttached* OxideQQuickWebView::qmlAttachedProperties(
     QObject* object) {

=== modified file 'qt/quick/api/oxideqquickwebview_p.h'
--- qt/quick/api/oxideqquickwebview_p.h	2013-12-16 12:18:07 +0000
+++ qt/quick/api/oxideqquickwebview_p.h	2014-01-07 14:38:44 +0000
@@ -33,6 +33,7 @@
 
 class OxideQLoadEvent;
 class OxideQQuickMessageHandler;
+class OxideQQuickNavigationHistory;
 class OxideQQuickWebContext;
 class OxideQQuickWebFrame;
 class OxideQQuickWebView;
@@ -69,6 +70,8 @@
 
   Q_PROPERTY(OxideQQuickWebContext* context READ context WRITE setContext)
 
+  Q_PROPERTY(OxideQQuickNavigationHistory* navigationHistory READ navigationHistory CONSTANT)
+
   Q_DECLARE_PRIVATE(OxideQQuickWebView)
 
  public:
@@ -104,6 +107,8 @@
   OxideQQuickWebContext* context() const;
   void setContext(OxideQQuickWebContext* context);
 
+  OxideQQuickNavigationHistory* navigationHistory();
+
   static OxideQQuickWebViewAttached* qmlAttachedProperties(QObject* object);
 
  public Q_SLOTS:

=== modified file 'qt/quick/api/oxideqquickwebview_p_p.h'
--- qt/quick/api/oxideqquickwebview_p_p.h	2013-12-16 12:18:07 +0000
+++ qt/quick/api/oxideqquickwebview_p_p.h	2014-01-07 14:38:44 +0000
@@ -25,6 +25,8 @@
 
 #include "qt/core/glue/oxide_qt_web_view_adapter.h"
 
+#include "oxideqquicknavigationhistory_p.h"
+
 class OxideQQuickMessageHandler;
 class OxideQQuickWebContext;
 class OxideQQuickWebView;
@@ -68,6 +70,10 @@
                   const QString& error_description) Q_DECL_FINAL;
   void LoadSucceeded(const QUrl& url) Q_DECL_FINAL;
 
+  void NavigationEntryCommitted() Q_DECL_FINAL;
+  void NavigationListPruned(bool from_front, int count) Q_DECL_FINAL;
+  void NavigationEntryChanged(int index) Q_DECL_FINAL;
+
   oxide::qt::WebFrameAdapter* CreateWebFrame() Q_DECL_FINAL;
 
   QRect GetContainerBounds() Q_DECL_FINAL;
@@ -92,6 +98,7 @@
   InitData* init_props() { return init_props_.data(); }
 
   OxideQQuickWebContext* context;
+  OxideQQuickNavigationHistory navigationHistory;
   QQmlComponent* popup_menu;
 
  private:

=== modified file 'qt/quick/oxide_qml_plugin.cc'
--- qt/quick/oxide_qml_plugin.cc	2013-10-31 03:16:28 +0000
+++ qt/quick/oxide_qml_plugin.cc	2014-01-07 14:38:44 +0000
@@ -26,6 +26,7 @@
 #include "qt/core/api/oxideqincomingmessage.h"
 #include "qt/core/api/oxideqloadevent.h"
 #include "qt/quick/api/oxideqquickmessagehandler_p.h"
+#include "qt/quick/api/oxideqquicknavigationhistory_p.h"
 #include "qt/quick/api/oxideqquickoutgoingmessagerequest_p.h"
 #include "qt/quick/api/oxideqquickuserscript_p.h"
 #include "qt/quick/api/oxideqquickwebcontext_p.h"
@@ -212,6 +213,8 @@
     qmlRegisterUncreatableType<OxideQQuickWebFrame>(uri, 0, 1, "WebFrame",
         "Frames are created automatically by Oxide to represent frames in the renderer");
     qmlRegisterType<OxideQQuickWebContext>(uri, 0, 1, "WebContext");
+    qmlRegisterUncreatableType<OxideQQuickNavigationHistory>(uri, 0, 1, "NavigationHistory",
+        "Each WebView has a NavigationHistory automatically instantiated by Oxide");
     qmlRegisterType<OxideQQuickWebView>(uri, 0, 1, "WebView");
   }
 };

=== modified file 'qt/quick/qmlplugin.pro'
--- qt/quick/qmlplugin.pro	2013-12-05 18:24:51 +0000
+++ qt/quick/qmlplugin.pro	2014-01-07 14:38:44 +0000
@@ -12,6 +12,7 @@
 
 SOURCES += \
     api/oxideqquickmessagehandler.cc \
+    api/oxideqquicknavigationhistory.cc \
     api/oxideqquickoutgoingmessagerequest.cc \
     api/oxideqquickuserscript.cc \
     api/oxideqquickwebcontext.cc \
@@ -26,6 +27,8 @@
 HEADERS += \
     api/oxideqquickmessagehandler_p.h \
     api/oxideqquickmessagehandler_p_p.h \
+    api/oxideqquicknavigationhistory_p.h \
+    api/oxideqquicknavigationhistory_p_p.h \
     api/oxideqquickoutgoingmessagerequest_p.h \
     api/oxideqquickoutgoingmessagerequest_p_p.h \
     api/oxideqquickuserscript_p.h \

=== modified file 'qt/tests/qmltests/data/tst_WebView_navigation1.html'
--- qt/tests/qmltests/data/tst_WebView_navigation1.html	2013-09-24 21:30:30 +0000
+++ qt/tests/qmltests/data/tst_WebView_navigation1.html	2014-01-07 14:38:44 +0000
@@ -1,4 +1,7 @@
 <html>
+<head>
+  <title>Navigation test 1</title>
+</head>
 <body>
   <h1>Navigation test 1</h1>
 </body>

=== modified file 'qt/tests/qmltests/data/tst_WebView_navigation2.html'
--- qt/tests/qmltests/data/tst_WebView_navigation2.html	2013-09-24 21:30:30 +0000
+++ qt/tests/qmltests/data/tst_WebView_navigation2.html	2014-01-07 14:38:44 +0000
@@ -1,4 +1,7 @@
 <html>
+<head>
+  <title>Navigation test 2</title>
+</head>
 <body>
   <h1>Navigation test 2</h1>
 </body>

=== modified file 'qt/tests/qmltests/data/tst_WebView_navigation3.html'
--- qt/tests/qmltests/data/tst_WebView_navigation3.html	2013-09-24 21:30:30 +0000
+++ qt/tests/qmltests/data/tst_WebView_navigation3.html	2014-01-07 14:38:44 +0000
@@ -1,5 +1,8 @@
 <html>
+<head>
+  <title>Navigation test 3</title>
+</head>
 <body>
-  <h1>Navigation test 2</h1>
+  <h1>Navigation test 3</h1>
 </body>
 </html>

=== modified file 'qt/tests/qmltests/data/tst_WebView_navigation4.html'
--- qt/tests/qmltests/data/tst_WebView_navigation4.html	2013-09-24 21:30:30 +0000
+++ qt/tests/qmltests/data/tst_WebView_navigation4.html	2014-01-07 14:38:44 +0000
@@ -1,4 +1,7 @@
 <html>
+<head>
+  <title>Navigation test 4</title>
+</head>
 <body>
   <h1>Navigation test 4</h1>
 </body>

=== added file 'qt/tests/qmltests/data/tst_WebView_navigationHistory.qml'
--- qt/tests/qmltests/data/tst_WebView_navigationHistory.qml	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/data/tst_WebView_navigationHistory.qml	2014-01-07 14:38:44 +0000
@@ -0,0 +1,116 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 0.1
+import com.canonical.Oxide.Testing 0.1
+
+TestWebView {
+  id: webView
+  focus: true
+  width: 200
+  height: 200
+
+  ListView {
+    id: navigationView
+    model: webView.navigationHistory
+    currentIndex: model.currentIndex
+    readonly property url currentUrl: currentItem ? currentItem.url : ""
+    readonly property string currentTitle: currentItem ? currentItem.title : ""
+    delegate: Item {
+      readonly property url url: model.url
+      readonly property string title: model.title
+    }
+  }
+
+  TestCase {
+    id: test
+    name: "WebView_navigationHistory"
+    when: windowShown
+
+    readonly property alias count: navigationView.count
+    readonly property alias currentIndex: navigationView.currentIndex
+    readonly property alias currentUrl: navigationView.currentUrl
+    readonly property alias currentTitle: navigationView.currentTitle
+
+    function verifyLoadSucceeded() {
+      verify(webView.waitForLoadSucceeded(),
+             "Timed out waiting for a successful load");
+    }
+
+    function loadUrl(url) {
+      webView.url = url;
+      verifyLoadSucceeded();
+    }
+
+    function compareAttributes(rCount, rCurrentIndex, rCurrentUrl,
+                               rCurrentTitle, message) {
+      compare(count, rCount, message);
+      compare(currentIndex, rCurrentIndex, message);
+      compare(currentUrl, rCurrentUrl, message);
+      tryCompare(test, "currentTitle", rCurrentTitle);
+    }
+
+    function test_WebView_navigationHistory() {
+      compareAttributes(0, -1, "", "",
+                        "Navigation history should be initially empty");
+
+      webView.navigationHistory.currentIndex = 0;
+      compare(currentIndex, -1,
+              "Cannot set the current index when the history is empty");
+
+      var url1 = "http://localhost:8080/tst_WebView_navigation1.html";
+      var title1 = "Navigation test 1";
+      loadUrl(url1);
+      compareAttributes(1, 0, url1, title1,
+                        "One entry / current is the first one");
+
+      webView.navigationHistory.currentIndex = -1;
+      compare(currentIndex, 0,
+              "Cannot set the current index to an invalid value");
+
+      var url2 = "http://localhost:8080/tst_WebView_navigation2.html";
+      var title2 = "Navigation test 2";
+      loadUrl(url2);
+      compareAttributes(2, 1, url2, title2,
+                        "Two entries / current entry is the last one");
+
+      webView.navigationHistory.currentIndex = 3;
+      compare(currentIndex, 1,
+              "Cannot set the current index to an invalid value");
+
+      webView.goBack();
+      verifyLoadSucceeded();
+      compareAttributes(2, 0, url1, title1,
+                        "No new entries / current is the first one");
+
+      webView.goForward();
+      verifyLoadSucceeded();
+      compareAttributes(2, 1, url2, title2,
+                        "No new entries / current is the last one");
+
+      webView.navigationHistory.currentIndex = 0;
+      verifyLoadSucceeded();
+      compareAttributes(2, 0, url1, title1,
+                        "No new entries / current is the first one");
+
+      var url3 = "http://localhost:8080/tst_WebView_navigation3.html";
+      var title3 = "Navigation test 3";
+      loadUrl(url3);
+      compareAttributes(2, 1, url3, title3, "Two entries / last one updated");
+
+      loadUrl(url1);
+      compareAttributes(3, 2, url1, title1,
+                        "Three entries / current is the last one");
+
+      webView.navigationHistory.currentIndex = 0;
+      verifyLoadSucceeded();
+      compareAttributes(3, 0, url1, title1,
+                        "No new entries / current is the first one");
+
+      var url4 = "http://localhost:8080/tst_WebView_navigation4.html";
+      var title4 = "Navigation test 4";
+      loadUrl(url4);
+      compareAttributes(2, 1, url4, title4,
+                        "Entry count updated / current is the last one");
+    }
+  }
+}

=== modified file 'shared/browser/oxide_web_view.cc'
--- shared/browser/oxide_web_view.cc	2013-12-16 12:18:07 +0000
+++ shared/browser/oxide_web_view.cc	2014-01-07 14:38:44 +0000
@@ -25,6 +25,13 @@
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/navigation_details.h"
+#include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/notification_details.h"
+#include "content/public/browser/notification_registrar.h"
+#include "content/public/browser/notification_service.h"
+#include "content/public/browser/notification_source.h"
+#include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "net/base/net_errors.h"
@@ -205,6 +212,10 @@
                            const std::string& error_description) {}
 void WebView::OnLoadSucceeded(const GURL& validated_url) {}
 
+void WebView::OnNavigationEntryCommitted() {}
+void WebView::OnNavigationListPruned(bool from_front, int count) {}
+void WebView::OnNavigationEntryChanged(int index) {}
+
 WebView::WebView() :
     root_frame_(NULL) {}
 
@@ -240,7 +251,13 @@
   }
 
   web_contents_->SetDelegate(this);
-  Observe(web_contents_.get());
+  WebContentsObserver::Observe(web_contents_.get());
+
+  registrar_.reset(new content::NotificationRegistrar);
+  registrar_->Add(this, content::NOTIFICATION_NAV_LIST_PRUNED,
+                  content::NotificationService::AllBrowserContextsAndSources());
+  registrar_->Add(this, content::NOTIFICATION_NAV_ENTRY_CHANGED,
+                  content::NotificationService::AllBrowserContextsAndSources());
 
   return true;
 }
@@ -251,7 +268,9 @@
     return;
   }
 
-  Observe(NULL);
+  registrar_.reset();
+
+  WebContentsObserver::Observe(NULL);
 
   if (root_frame_) {
     root_frame_->DestroyFrame();
@@ -363,6 +382,62 @@
   return BrowserContext::FromContent(web_contents_->GetBrowserContext());
 }
 
+int WebView::GetNavigationEntryCount() const {
+  if (!web_contents_) {
+    return 0;
+  }
+  return web_contents_->GetController().GetEntryCount();
+}
+
+int WebView::GetNavigationCurrentEntryIndex() const {
+  if (!web_contents_) {
+    return -1;
+  }
+  return web_contents_->GetController().GetCurrentEntryIndex();
+}
+
+void WebView::SetNavigationCurrentEntryIndex(int index) {
+  if (web_contents_) {
+    web_contents_->GetController().GoToIndex(index);
+  }
+}
+
+int WebView::GetNavigationEntryUniqueID(int index) const {
+  if (!web_contents_) {
+    return 0;
+  }
+  const content::NavigationController& controller = web_contents_->GetController();
+  content::NavigationEntry* entry = controller.GetEntryAtIndex(index);
+  return entry->GetUniqueID();
+}
+
+const GURL& WebView::GetNavigationEntryUrl(int index) const {
+  if (!web_contents_) {
+    return GURL::EmptyGURL();
+  }
+  const content::NavigationController& controller = web_contents_->GetController();
+  content::NavigationEntry* entry = controller.GetEntryAtIndex(index);
+  return entry->GetURL();
+}
+
+std::string WebView::GetNavigationEntryTitle(int index) const {
+  if (!web_contents_) {
+    return std::string();
+  }
+  const content::NavigationController& controller = web_contents_->GetController();
+  content::NavigationEntry* entry = controller.GetEntryAtIndex(index);
+  return base::UTF16ToUTF8(entry->GetTitle());
+}
+
+base::Time WebView::GetNavigationEntryTimestamp(int index) const {
+  if (!web_contents_) {
+    return base::Time();
+  }
+  const content::NavigationController& controller = web_contents_->GetController();
+  content::NavigationEntry* entry = controller.GetEntryAtIndex(index);
+  return entry->GetTimestamp();
+}
+
 WebFrame* WebView::GetRootFrame() const {
   return root_frame_;
 }
@@ -389,6 +464,21 @@
   return NULL;
 }
 
+void WebView::Observe(int type,
+                      const content::NotificationSource& source,
+                      const content::NotificationDetails& details) {
+  if (content::Source<content::NavigationController>(source).ptr() != &web_contents()->GetController()) {
+    return;
+  }
+  if (type == content::NOTIFICATION_NAV_LIST_PRUNED) {
+    content::PrunedDetails* pruned_details = content::Details<content::PrunedDetails>(details).ptr();
+    OnNavigationListPruned(pruned_details->from_front, pruned_details->count);
+  } else if (type == content::NOTIFICATION_NAV_ENTRY_CHANGED) {
+    int index = content::Details<content::EntryChangedDetails>(details).ptr()->index;
+    OnNavigationEntryChanged(index);
+  }
+}
+
 void WebView::RenderViewHostChanged(content::RenderViewHost* old_host,
                                     content::RenderViewHost* new_host) {
   // Make sure the new RWHV gets the correct size
@@ -480,6 +570,10 @@
   DispatchLoadFailed(validated_url, error_code, error_description);
 }
 
+void WebView::NavigationEntryCommitted(
+    const content::LoadCommittedDetails& load_details) {
+  OnNavigationEntryCommitted();
+}
 
 void WebView::FrameDetached(content::RenderViewHost* rvh,
                             int64 frame_id) {
@@ -491,6 +585,20 @@
   frame->DestroyFrame();
 }
 
+void WebView::TitleWasSet(content::NavigationEntry* entry, bool explicit_set) {
+  if (!web_contents_) {
+    return;
+  }
+  const content::NavigationController& controller = web_contents_->GetController();
+  int count = controller.GetEntryCount();
+  for (int i = 0; i < count; ++i) {
+    if (controller.GetEntryAtIndex(i) == entry) {
+      OnNavigationEntryChanged(i);
+      return;
+    }
+  }
+}
+
 bool WebView::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebView, message)

=== modified file 'shared/browser/oxide_web_view.h'
--- shared/browser/oxide_web_view.h	2013-12-16 12:18:07 +0000
+++ shared/browser/oxide_web_view.h	2014-01-07 14:38:44 +0000
@@ -24,6 +24,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
+#include "content/public/browser/notification_observer.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/gfx/rect.h"
@@ -41,6 +42,7 @@
 
 namespace content {
 
+class NotificationRegistrar;
 struct OpenURLParams;
 class RenderWidgetHost;
 class RenderWidgetHostView;
@@ -58,6 +60,7 @@
 // this. Note that this class will hold the main browser process
 // components alive
 class WebView : public MessageTarget,
+                public content::NotificationObserver,
                 public content::WebContentsDelegate,
                 public content::WebContentsObserver {
  public:
@@ -94,9 +97,21 @@
 
   BrowserContext* GetBrowserContext() const;
 
+  int GetNavigationEntryCount() const;
+  int GetNavigationCurrentEntryIndex() const;
+  void SetNavigationCurrentEntryIndex(int index);
+  int GetNavigationEntryUniqueID(int index) const;
+  const GURL& GetNavigationEntryUrl(int index) const;
+  std::string GetNavigationEntryTitle(int index) const;
+  base::Time GetNavigationEntryTimestamp(int index) const;
+
   WebFrame* GetRootFrame() const;
   WebFrame* FindFrameWithID(int64 frame_id) const;
 
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) FINAL;
+
   void RenderViewHostChanged(content::RenderViewHost* old_host,
                              content::RenderViewHost* new_host) FINAL;
 
@@ -137,9 +152,14 @@
                    const base::string16& error_description,
                    content::RenderViewHost* render_view_host) FINAL;
 
+  void NavigationEntryCommitted(
+      const content::LoadCommittedDetails& load_details) FINAL;
+
   void FrameDetached(content::RenderViewHost* rvh,
                      int64 frame_id) FINAL;
 
+  void TitleWasSet(content::NavigationEntry* entry, bool explicit_set) FINAL;
+
   bool OnMessageReceived(const IPC::Message& message) FINAL;
 
   virtual size_t GetMessageHandlerCount() const OVERRIDE;
@@ -200,11 +220,17 @@
                             const std::string& error_description);
   virtual void OnLoadSucceeded(const GURL& validated_url);
 
+  virtual void OnNavigationEntryCommitted();
+  virtual void OnNavigationListPruned(bool from_front, int count);
+  virtual void OnNavigationEntryChanged(int index);
+
   virtual WebFrame* CreateWebFrame() = 0;
 
   scoped_ptr<content::WebContents> web_contents_;
   WebFrame* root_frame_;
 
+  scoped_ptr<content::NotificationRegistrar> registrar_;
+
   DISALLOW_COPY_AND_ASSIGN(WebView);
 };