Merge remote-tracking branch 'origin/5.6' into devwip/47-based

Change-Id: I0569b04ced3456a1d5d91e02e117963115fcf1b2

1 files changed, 11 insertions, 15 deletions

diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp
index 323659827..b98aa3a61 100644
--- a/src/webenginewidgets/api/qwebengineprofile.cpp
+++ b/src/webenginewidgets/api/qwebengineprofile.cpp
@@ -42,7 +42,6 @@
 #include "qwebenginepage.h"
 #include "qwebengineprofile_p.h"
 #include "qwebenginesettings.h"
-#include "qwebengineurlschemehandler_p.h"
 #include "qwebenginescriptcollection_p.h"
 
 #include "browser_context_adapter.h"
@@ -545,8 +544,8 @@ QWebEngineSettings *QWebEngineProfile::settings() const
 const QWebEngineUrlSchemeHandler *QWebEngineProfile::urlSchemeHandler(const QByteArray &scheme) const
 {
     const Q_D(QWebEngineProfile);
-    if (d->m_urlSchemeHandlers.contains(scheme))
-        return d->m_urlSchemeHandlers.value(scheme);
+    if (d->browserContext()->customUrlSchemeHandlers().contains(scheme))
+        return d->browserContext()->customUrlSchemeHandlers().value(scheme);
     return 0;
 }
 
@@ -571,18 +570,17 @@ void QWebEngineProfile::installUrlSchemeHandler(QWebEngineUrlSchemeHandler *hand
     Q_ASSERT(handler);
     QByteArray scheme = handler->scheme();
     if (checkInternalScheme(scheme)) {
-        qWarning() << "Can not install a URL scheme handler overriding internal scheme: " << scheme;
+        qWarning("Can not install a URL scheme handler overriding internal scheme: %s", scheme.constData());
         return;
     }
 
-    if (d->m_urlSchemeHandlers.contains(scheme)) {
-        qWarning() << "URL scheme handler already installed for the scheme: " << scheme;
+    if (d->browserContext()->customUrlSchemeHandlers().contains(scheme)) {
+        qWarning("URL scheme handler already installed for the scheme: %s", scheme.constData());
         return;
     }
-    d->m_urlSchemeHandlers.insert(scheme, handler);
-    d->browserContext()->customUrlSchemeHandlers().append(handler->d_func());
+    d->browserContext()->customUrlSchemeHandlers().insert(scheme, handler);
     d->browserContext()->updateCustomUrlSchemeHandlers();
-    connect(handler, SIGNAL(destroyed(QObject*)), this, SLOT(destroyedUrlSchemeHandler(QObject*)));
+    connect(handler, SIGNAL(destroyed(QWebEngineUrlSchemeHandler*)), this, SLOT(destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*)));
 }
 
 /*!
@@ -596,11 +594,10 @@ void QWebEngineProfile::removeUrlSchemeHandler(QWebEngineUrlSchemeHandler *handl
     Q_ASSERT(handler);
     if (!handler)
         return;
-    int count = d->m_urlSchemeHandlers.remove(handler->scheme());
+    int count = d->browserContext()->customUrlSchemeHandlers().remove(handler->scheme());
     if (!count)
         return;
-    disconnect(handler, SIGNAL(destroyed(QObject*)), this, SLOT(destroyedUrlSchemeHandler(QObject*)));
-    d->browserContext()->removeCustomUrlSchemeHandler(handler->d_func());
+    disconnect(handler, SIGNAL(destroyed(QWebEngineUrlSchemeHandler*)), this, SLOT(destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*)));
     d->browserContext()->updateCustomUrlSchemeHandlers();
 }
 
@@ -612,14 +609,13 @@ void QWebEngineProfile::removeUrlSchemeHandler(QWebEngineUrlSchemeHandler *handl
 void QWebEngineProfile::clearUrlSchemeHandlers()
 {
     Q_D(QWebEngineProfile);
-    d->m_urlSchemeHandlers.clear();
     d->browserContext()->customUrlSchemeHandlers().clear();
     d->browserContext()->updateCustomUrlSchemeHandlers();
 }
 
-void QWebEngineProfile::destroyedUrlSchemeHandler(QObject *obj)
+void QWebEngineProfile::destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler *obj)
 {
-    removeUrlSchemeHandler(qobject_cast<QWebEngineUrlSchemeHandler*>(obj));
+    removeUrlSchemeHandler(obj);
 }
 
 QT_END_NAMESPACE