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

[Olivier Tilloy]

Add an 'icon' property to the QML WebView.

[lp:~osomon/oxide/icon]

323. By Olivier Tilloy on 2014-02-10

Merged the latest changes from trunk and resolve conflicts.

324. By Olivier Tilloy on 2014-02-21

Merged the latest changes from trunk and resolve conflicts.

325. By Olivier Tilloy on 2014-03-04

Merged the latest changes from trunk and resolve conflicts.

326. By Olivier Tilloy on 2014-03-31

Merged the latest changes from trunk and resolve conflicts.

327. By Olivier Tilloy on 2014-03-31

Re-use empty HTML page.

328. By Olivier Tilloy on 2014-04-10

Merge the latest changes from trunk and resolve a couple of conflicts.

329. By Olivier Tilloy on 2014-05-28

Merge the latest changes from trunk and resolve a conflict.

330. By Olivier Tilloy on 2014-05-28

Updated to chromium API changes.

[Olivier Tilloy (osomon)]

I had a quick look into adding an icon attribute to the navigation history entries, as suggested by Chris for this branch to be feature-complete.

It turns out the navigation controller doesn’t store favicon information by default, it’s up to the application to set it. Chrome has a FaviconService class that serves this purposes, which itself talks to a HistoryService instance. Implementing something similar in oxide would involve quite some new code, and I’m not sure where it would belong.

How about doing it in two steps, this branch first (as it’s required for feature parity with QtWebKit/QtWebEngine), and favicons for navigation history later on?

[Chris Coulson (chrisccoulson)]

Thanks, this is fine to commit as it is then. Would you mind opening a bug report for adding an icon property to the navigation entries?

Thanks!

review: Approve

[Olivier Tilloy (osomon)]

Thanks. I filed bug #1324818.

=== modified file 'qt/core/browser/oxide_qt_web_view.cc'
--- qt/core/browser/oxide_qt_web_view.cc	2014-05-19 23:47:11 +0000
+++ qt/core/browser/oxide_qt_web_view.cc	2014-05-28 08:47:28 +0000
@@ -171,6 +171,10 @@
   adapter_->TitleChanged();
 }
 
+void WebView::OnIconChanged(const GURL& icon) {
+  adapter_->IconChanged(QUrl(QString::fromStdString(icon.spec())));
+}
+
 void WebView::OnCommandsUpdated() {
   adapter_->CommandsUpdated();
 }

=== modified file 'qt/core/browser/oxide_qt_web_view.h'
--- qt/core/browser/oxide_qt_web_view.h	2014-05-19 13:28:19 +0000
+++ qt/core/browser/oxide_qt_web_view.h	2014-05-28 08:47:28 +0000
@@ -69,6 +69,7 @@
 
   void OnURLChanged() FINAL;
   void OnTitleChanged() FINAL;
+  void OnIconChanged(const GURL& icon) FINAL;
   void OnCommandsUpdated() FINAL;
 
   void OnLoadProgressChanged(double progress) FINAL;

=== modified file 'qt/core/glue/oxide_qt_web_view_adapter.h'
--- qt/core/glue/oxide_qt_web_view_adapter.h	2014-05-20 15:36:50 +0000
+++ qt/core/glue/oxide_qt_web_view_adapter.h	2014-05-28 08:47:28 +0000
@@ -134,6 +134,7 @@
 
   virtual void URLChanged() = 0;
   virtual void TitleChanged() = 0;
+  virtual void IconChanged(QUrl icon) = 0;
   virtual void CommandsUpdated() = 0;
 
   virtual void LoadProgressChanged(double progress) = 0;

=== modified file 'qt/quick/api/oxideqquickwebview.cc'
--- qt/quick/api/oxideqquickwebview.cc	2014-05-20 15:36:50 +0000
+++ qt/quick/api/oxideqquickwebview.cc	2014-05-28 08:47:28 +0000
@@ -148,6 +148,15 @@
   emit q->titleChanged();
 }
 
+void OxideQQuickWebViewPrivate::IconChanged(QUrl icon) {
+  Q_Q(OxideQQuickWebView);
+
+  if (icon != icon_) {
+    icon_ = icon;
+    emit q->iconChanged();
+  }
+}
+
 void OxideQQuickWebViewPrivate::CommandsUpdated() {
   Q_Q(OxideQQuickWebView);
 
@@ -496,6 +505,12 @@
   return d->title();
 }
 
+QUrl OxideQQuickWebView::icon() const {
+  Q_D(const OxideQQuickWebView);
+
+  return d->icon_;
+}
+
 bool OxideQQuickWebView::canGoBack() const {
   Q_D(const OxideQQuickWebView);
 

=== modified file 'qt/quick/api/oxideqquickwebview_p.h'
--- qt/quick/api/oxideqquickwebview_p.h	2014-05-20 15:36:50 +0000
+++ qt/quick/api/oxideqquickwebview_p.h	2014-05-28 08:47:28 +0000
@@ -66,6 +66,7 @@
 
   Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
   Q_PROPERTY(QString title READ title NOTIFY titleChanged)
+  Q_PROPERTY(QUrl icon READ icon NOTIFY iconChanged)
   Q_PROPERTY(bool canGoBack READ canGoBack NOTIFY navigationHistoryChanged)
   Q_PROPERTY(bool canGoForward READ canGoForward NOTIFY navigationHistoryChanged)
   Q_PROPERTY(bool incognito READ incognito WRITE setIncognito NOTIFY incognitoChanged)
@@ -113,6 +114,8 @@
 
   QString title() const;
 
+  QUrl icon() const;
+
   bool canGoBack() const;
   bool canGoForward() const;
 
@@ -173,6 +176,7 @@
  Q_SIGNALS:
   void urlChanged();
   void titleChanged();
+  void iconChanged();
   void navigationHistoryChanged();
   void incognitoChanged();
   void loadingChanged(OxideQLoadEvent* loadEvent);

=== modified file 'qt/quick/api/oxideqquickwebview_p_p.h'
--- qt/quick/api/oxideqquickwebview_p_p.h	2014-05-19 13:26:44 +0000
+++ qt/quick/api/oxideqquickwebview_p_p.h	2014-05-28 08:47:28 +0000
@@ -61,6 +61,7 @@
 
   void URLChanged() Q_DECL_FINAL;
   void TitleChanged() Q_DECL_FINAL;
+  void IconChanged(QUrl icon) Q_DECL_FINAL;
   void CommandsUpdated() Q_DECL_FINAL;
 
   void LoadProgressChanged(double progress) Q_DECL_FINAL;
@@ -116,8 +117,9 @@
   void attachContextSignals(OxideQQuickWebContextPrivate* context);
   void detachContextSignals(OxideQQuickWebContextPrivate* context);
 
+  bool constructed_;
   int load_progress_;
-  bool constructed_;
+  QUrl icon_;
   OxideQQuickNavigationHistory navigation_history_;
   QQmlComponent* popup_menu_;
   QQmlComponent* alert_dialog_;

=== added file 'qt/tests/qmltests/api/tst_WebView_icon.html'
--- qt/tests/qmltests/api/tst_WebView_icon.html	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_icon.html	2014-05-28 08:47:28 +0000
@@ -0,0 +1,5 @@
+<html>
+<head>
+  <link rel="icon" href="icon.ico" />
+</head>
+</html>

=== added file 'qt/tests/qmltests/api/tst_WebView_icon.qml'
--- qt/tests/qmltests/api/tst_WebView_icon.qml	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_icon.qml	2014-05-28 08:47:28 +0000
@@ -0,0 +1,32 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide.Testing 1.0
+
+TestWebView {
+  id: webView
+  focus: true
+  width: 200
+  height: 200
+
+  TestCase {
+    name: "WebView_icon"
+    when: windowShown
+
+    function test_WebView_icon_data() {
+      return [
+        { url: "", icon: "" },
+        { url: "http://localhost:8080/empty.html", icon: "http://localhost:8080/favicon.ico" },
+        { url: "http://localhost:8080/tst_WebView_icon.html", icon: "http://localhost:8080/icon.ico" }
+      ];
+    }
+
+    function test_WebView_icon(data) {
+      if (data.url) {
+        webView.url = data.url;
+        verify(webView.waitForLoadSucceeded(),
+               "Timed out waiting for a successful load");
+      }
+      compare(webView.icon.toString(), data.icon);
+    }
+  }
+}

=== modified file 'shared/browser/oxide_web_view.cc'
--- shared/browser/oxide_web_view.cc	2014-05-21 16:35:27 +0000
+++ shared/browser/oxide_web_view.cc	2014-05-28 08:47:28 +0000
@@ -37,6 +37,7 @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/favicon_url.h"
 #include "content/public/common/menu_item.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/net_errors.h"
@@ -561,8 +562,20 @@
   }
 }
 
+void WebView::DidUpdateFaviconURL(
+    const std::vector<content::FaviconURL>& candidates) {
+  std::vector<content::FaviconURL>::const_iterator it;
+  for (it = candidates.begin(); it != candidates.end(); ++it) {
+    if (it->icon_type == content::FaviconURL::FAVICON) {
+      OnIconChanged(it->icon_url);
+      return;
+    }
+  }
+}
+
 void WebView::OnURLChanged() {}
 void WebView::OnTitleChanged() {}
+void WebView::OnIconChanged(const GURL& icon) {}
 void WebView::OnCommandsUpdated() {}
 
 void WebView::OnLoadProgressChanged(double progress) {}

=== modified file 'shared/browser/oxide_web_view.h'
--- shared/browser/oxide_web_view.h	2014-05-20 15:36:50 +0000
+++ shared/browser/oxide_web_view.h	2014-05-28 08:47:28 +0000
@@ -293,8 +293,12 @@
 
   void TitleWasSet(content::NavigationEntry* entry, bool explicit_set) FINAL;
 
+  void DidUpdateFaviconURL(
+      const std::vector<content::FaviconURL>& candidates) FINAL;
+
   virtual void OnURLChanged();
   virtual void OnTitleChanged();
+  virtual void OnIconChanged(const GURL& icon);
   virtual void OnCommandsUpdated();
 
   virtual void OnLoadProgressChanged(double progress);