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

[Olivier Tilloy]

Be more tolerant when converting a GURL to a QUrl when calling QDesktopServices::openUrl().

Note: I’m not sure whether this tolerant GURL2QUrl function should be used everywhere we translate a GURL into a QUrl (quite a few places in the codebase), or if it’s ok to keep it confined there.

[lp:~osomon/oxide/tolerant-GURL2QUrl]

1057. By Olivier Tilloy on 2015-04-24

Add a debug check.

[Olivier Tilloy (osomon)]

Not needed any longer as bug #1447617 is invalid now.

review: Disapprove

Unmerged revisions

1057. By Olivier Tilloy on 2015-04-24

Add a debug check.

1056. By Olivier Tilloy on 2015-04-24

Be more tolerant when converting a GURL to a QUrl when calling QDesktopServices::openUrl().

=== modified file 'qt/core/browser/oxide_qt_browser_platform_integration.cc'
--- qt/core/browser/oxide_qt_browser_platform_integration.cc	2015-03-24 17:06:40 +0000
+++ qt/core/browser/oxide_qt_browser_platform_integration.cc	2015-04-24 09:02:06 +0000
@@ -27,6 +27,7 @@
 #include <QtGui/qpa/qplatformnativeinterface.h>
 
 #include "base/lazy_instance.h"
+#include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "content/public/browser/browser_thread.h"
 #include "url/gurl.h"
@@ -46,8 +47,31 @@
 namespace {
 base::LazyInstance<QPointer<QThread> > g_io_thread;
 
+QUrl GURL2QUrl(const GURL& url) {
+  if (!url.is_valid()) {
+    return QUrl();
+  }
+  QUrl parsed = QUrl(QString::fromStdString(url.spec()));
+  if (parsed.isValid()) {
+    return parsed;
+  }
+  // Special case where GURL’s parser is more tolerant than QUrl’s
+  // (see https://launchpad.net/bugs/1447617).
+  DCHECK(!url.has_host());
+  QUrl tolerant;
+  tolerant.setScheme(QString::fromStdString(url.scheme()));
+  tolerant.setPath(QString::fromStdString(url.path()));
+  if (url.has_query()) {
+    tolerant.setQuery(QString::fromStdString(url.query()));
+  }
+  if (url.has_ref()) {
+    tolerant.setFragment(QString::fromStdString(url.ref()));
+  }
+  return tolerant;
+}
+
 void LaunchURLExternallyOnUIThread(const GURL& url) {
-  QDesktopServices::openUrl(QUrl(QString::fromStdString(url.spec())));
+  QDesktopServices::openUrl(GURL2QUrl(url));
 }
 
 }