Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/3rdparty
	src/core/browser_context_adapter.cpp
	src/core/web_contents_adapter.cpp
	tests/auto/widgets/qwebenginepage/BLACKLIST

Change-Id: I45ee0a33f6316f585555d58fede8072fe514aecf

17 files changed, 50 insertions, 30 deletions

diff --git a/src/core/api/qwebenginecookiestore.h b/src/core/api/qwebenginecookiestore.h
index 3b7b5e89b..5001ba3a1 100644
--- a/src/core/api/qwebenginecookiestore.h
+++ b/src/core/api/qwebenginecookiestore.h
@@ -73,7 +73,7 @@ Q_SIGNALS:
     void cookieRemoved(const QNetworkCookie &cookie);
 
 private:
-    explicit QWebEngineCookieStore(QObject *parent = 0);
+    explicit QWebEngineCookieStore(QObject *parent = Q_NULLPTR);
     friend class QtWebEngineCore::BrowserContextAdapter;
     friend class QtWebEngineCore::CookieMonsterDelegateQt;
     Q_DISABLE_COPY(QWebEngineCookieStore)
diff --git a/src/core/api/qwebengineurlrequestinterceptor.h b/src/core/api/qwebengineurlrequestinterceptor.h
index fb5861c7d..6e0f93e49 100644
--- a/src/core/api/qwebengineurlrequestinterceptor.h
+++ b/src/core/api/qwebengineurlrequestinterceptor.h
@@ -55,7 +55,7 @@ class QWEBENGINE_EXPORT QWebEngineUrlRequestInterceptor : public QObject
     Q_OBJECT
     Q_DISABLE_COPY(QWebEngineUrlRequestInterceptor)
 public:
-    explicit QWebEngineUrlRequestInterceptor(QObject *p = 0)
+    explicit QWebEngineUrlRequestInterceptor(QObject *p = Q_NULLPTR)
         : QObject (p)
     {
     }
diff --git a/src/core/api/qwebengineurlschemehandler.h b/src/core/api/qwebengineurlschemehandler.h
index 5075af6d5..757c461f4 100644
--- a/src/core/api/qwebengineurlschemehandler.h
+++ b/src/core/api/qwebengineurlschemehandler.h
@@ -55,7 +55,7 @@ class QWebEngineUrlRequestJob;
 class QWEBENGINE_EXPORT QWebEngineUrlSchemeHandler : public QObject {
     Q_OBJECT
 public:
-    QWebEngineUrlSchemeHandler(QObject *parent = 0);
+    QWebEngineUrlSchemeHandler(QObject *parent = Q_NULLPTR);
     ~QWebEngineUrlSchemeHandler();
 
     virtual void requestStarted(QWebEngineUrlRequestJob*) = 0;
diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp
index ba9d671ae..e3b757587 100644
--- a/src/core/browser_context_adapter.cpp
+++ b/src/core/browser_context_adapter.cpp
@@ -104,7 +104,8 @@ void BrowserContextAdapter::setStorageName(const QString &storageName)
     m_name = storageName;
     if (m_browserContext->url_request_getter_.get())
         m_browserContext->url_request_getter_->updateStorageSettings();
-    m_visitedLinksManager.reset();
+    if (m_visitedLinksManager)
+        resetVisitedLinksManager();
 }
 
 void BrowserContextAdapter::setOffTheRecord(bool offTheRecord)
@@ -114,7 +115,8 @@ void BrowserContextAdapter::setOffTheRecord(bool offTheRecord)
     m_offTheRecord = offTheRecord;
     if (m_browserContext->url_request_getter_.get())
         m_browserContext->url_request_getter_->updateStorageSettings();
-    m_visitedLinksManager.reset();
+    if (m_visitedLinksManager)
+        resetVisitedLinksManager();
 }
 
 BrowserContextQt *BrowserContextAdapter::browserContext()
@@ -125,7 +127,7 @@ BrowserContextQt *BrowserContextAdapter::browserContext()
 WebEngineVisitedLinksManager *BrowserContextAdapter::visitedLinksManager()
 {
     if (!m_visitedLinksManager)
-        m_visitedLinksManager.reset(new WebEngineVisitedLinksManager(this));
+        resetVisitedLinksManager();
     return m_visitedLinksManager.data();
 }
 
@@ -198,7 +200,8 @@ void BrowserContextAdapter::setDataPath(const QString &path)
     m_dataPath = path;
     if (m_browserContext->url_request_getter_.get())
         m_browserContext->url_request_getter_->updateStorageSettings();
-    m_visitedLinksManager.reset();
+    if (m_visitedLinksManager)
+        resetVisitedLinksManager();
 }
 
 QString BrowserContextAdapter::cachePath() const
@@ -339,7 +342,8 @@ void BrowserContextAdapter::setVisitedLinksPolicy(BrowserContextAdapter::Visited
     if (m_visitedLinksPolicy == visitedLinksPolicy)
         return;
     m_visitedLinksPolicy = visitedLinksPolicy;
-    m_visitedLinksManager.reset();
+    if (m_visitedLinksManager)
+        resetVisitedLinksManager();
 }
 
 int BrowserContextAdapter::httpCacheMaxSize() const
@@ -500,4 +504,9 @@ bool BrowserContextAdapter::isSpellCheckEnabled() const
 #endif
 }
 
+void BrowserContextAdapter::resetVisitedLinksManager()
+{
+    m_visitedLinksManager.reset(new WebEngineVisitedLinksManager(this));
+}
+
 } // namespace QtWebEngineCore
diff --git a/src/core/browser_context_adapter.h b/src/core/browser_context_adapter.h
index c3c3f153d..94bc5fcde 100644
--- a/src/core/browser_context_adapter.h
+++ b/src/core/browser_context_adapter.h
@@ -175,6 +175,7 @@ public:
 
 private:
     void updateCustomUrlSchemeHandlers();
+    void resetVisitedLinksManager();
 
     QString m_name;
     bool m_offTheRecord;
diff --git a/src/core/clipboard_qt.cpp b/src/core/clipboard_qt.cpp
index cd57995ea..bd62f4872 100644
--- a/src/core/clipboard_qt.cpp
+++ b/src/core/clipboard_qt.cpp
@@ -285,6 +285,8 @@ void ClipboardQt::ReadAvailableTypes(ui::ClipboardType type, std::vector<base::s
 
     types->clear();
     const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(type == ui::CLIPBOARD_TYPE_COPY_PASTE ? QClipboard::Clipboard : QClipboard::Selection);
+    if (mimeData->hasImage())
+        types->push_back(toString16(QStringLiteral("image/png")));
     Q_FOREACH (const QString &mimeType, mimeData->formats())
         types->push_back(toString16(mimeType));
     *contains_filenames = false;
@@ -328,8 +330,6 @@ void ClipboardQt::ReadRTF(ui::ClipboardType type, std::string* result) const
 
 SkBitmap ClipboardQt::ReadImage(ui::ClipboardType type) const
 {
-    // FIXME: Untested, pasting image data seems to only be supported through
-    // FileReader.readAsDataURL in JavaScript and this isn't working down the pipe for some reason.
     const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(type == ui::CLIPBOARD_TYPE_COPY_PASTE ? QClipboard::Clipboard : QClipboard::Selection);
     QImage image = qvariant_cast<QImage>(mimeData->imageData());
 
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index 6094be847..5d1780cbe 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -93,8 +93,6 @@ public:
         blink::WebString qrcScheme(base::ASCIIToUTF16(kQrcSchemeQt));
         // mark qrc as a secure scheme (avoids deprecation warnings)
         blink::WebSecurityPolicy::registerURLSchemeAsSecure(qrcScheme);
-        // mark qrc as a local scheme (allows local access to qrc)
-        blink::WebSecurityPolicy::registerURLSchemeAsLocal(qrcScheme);
     }
 };
 
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 82d21696c..0ed0b91f9 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -426,6 +426,12 @@ void WebContentsAdapter::initialize(WebContentsAdapterClient *adapterClient)
     PrintViewManagerQt::CreateForWebContents(webContents());
 #endif // defined(ENABLE_BASIC_PRINTING)
 
+    // Create an instance of WebEngineVisitedLinksManager to catch the first
+    // content::NOTIFICATION_RENDERER_PROCESS_CREATED event. This event will
+    // force to initialize visited links in VisitedLinkSlave.
+    // It must be done before creating a RenderView.
+    d->browserContextAdapter->visitedLinksManager();
+
     // Create a RenderView with the initial empty document
     content::RenderViewHost *rvh = d->webContents->GetRenderViewHost();
     Q_ASSERT(rvh);
diff --git a/src/webengine/api/qquickwebengineprofile.h b/src/webengine/api/qquickwebengineprofile.h
index 4f9684a86..9240132b2 100644
--- a/src/webengine/api/qquickwebengineprofile.h
+++ b/src/webengine/api/qquickwebengineprofile.h
@@ -150,7 +150,7 @@ private Q_SLOTS:
 
 private:
     Q_DECLARE_PRIVATE(QQuickWebEngineProfile)
-    QQuickWebEngineProfile(QQuickWebEngineProfilePrivate *, QObject *parent = 0);
+    QQuickWebEngineProfile(QQuickWebEngineProfilePrivate *, QObject *parent = Q_NULLPTR);
     QQuickWebEngineSettings *settings() const;
 
     friend class QQuickWebEngineSettings;
diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc
index 444f0f398..a4630484e 100644
--- a/src/webengine/doc/src/webengineview.qdoc
+++ b/src/webengine/doc/src/webengineview.qdoc
@@ -47,8 +47,11 @@
     \section2 Loading Web Pages
 
     An application can load pages into the WebEngineView, using either the \l url property or the
-    \l loadHtml method and navigate within the view's session history. The history is represented
-    by a WebEngineHistory data model that is held by the \l navigationHistory property.
+    \l loadHtml method and navigate within the view's session history. The GET
+    method is always used to load URLs.
+
+    The history is represented by a WebEngineHistory data model that is held by
+    the \l navigationHistory property.
 
     The following sample QML application loads a web page using the \c url property:
 
diff --git a/src/webenginewidgets/api/qwebenginedownloaditem.h b/src/webenginewidgets/api/qwebenginedownloaditem.h
index 390a1a598..80b5c06c5 100644
--- a/src/webenginewidgets/api/qwebenginedownloaditem.h
+++ b/src/webenginewidgets/api/qwebenginedownloaditem.h
@@ -99,7 +99,7 @@ private:
 
     friend class QWebEngineProfilePrivate;
 
-    QWebEngineDownloadItem(QWebEngineDownloadItemPrivate*, QObject *parent = 0);
+    QWebEngineDownloadItem(QWebEngineDownloadItemPrivate*, QObject *parent = Q_NULLPTR);
     QScopedPointer<QWebEngineDownloadItemPrivate> d_ptr;
 };
 
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index 0c6450d20..2ac8e0f3e 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -188,8 +188,8 @@ public:
         KilledTerminationStatus
     };
 
-    explicit QWebEnginePage(QObject *parent = 0);
-    QWebEnginePage(QWebEngineProfile *profile, QObject *parent = 0);
+    explicit QWebEnginePage(QObject *parent = Q_NULLPTR);
+    QWebEnginePage(QWebEngineProfile *profile, QObject *parent = Q_NULLPTR);
     ~QWebEnginePage();
     QWebEngineHistory *history() const;
 
@@ -208,10 +208,10 @@ public:
 
     virtual bool event(QEvent*);
 #ifdef Q_QDOC
-    void findText(const QString &subString, FindFlags options = 0);
+    void findText(const QString &subString, FindFlags options = FindFlags());
     void findText(const QString &subString, FindFlags options, FunctorOrLambda resultCallback);
 #else
-    void findText(const QString &subString, FindFlags options = 0, const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
+    void findText(const QString &subString, FindFlags options = FindFlags(), const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
 #endif
     QMenu *createStandardContextMenu();
 
diff --git a/src/webenginewidgets/api/qwebengineprofile.h b/src/webenginewidgets/api/qwebengineprofile.h
index 22a913fb2..d981fa5bb 100644
--- a/src/webenginewidgets/api/qwebengineprofile.h
+++ b/src/webenginewidgets/api/qwebengineprofile.h
@@ -63,8 +63,8 @@ class QWebEngineUrlSchemeHandler;
 class QWEBENGINEWIDGETS_EXPORT QWebEngineProfile : public QObject {
     Q_OBJECT
 public:
-    explicit QWebEngineProfile(QObject *parent = 0);
-    explicit QWebEngineProfile(const QString &name, QObject *parent = 0);
+    explicit QWebEngineProfile(QObject *parent = Q_NULLPTR);
+    explicit QWebEngineProfile(const QString &name, QObject *parent = Q_NULLPTR);
     virtual ~QWebEngineProfile();
 
     enum HttpCacheType {
@@ -132,7 +132,7 @@ private Q_SLOTS:
 private:
     Q_DISABLE_COPY(QWebEngineProfile)
     Q_DECLARE_PRIVATE(QWebEngineProfile)
-    QWebEngineProfile(QWebEngineProfilePrivate *, QObject *parent = 0);
+    QWebEngineProfile(QWebEngineProfilePrivate *, QObject *parent = Q_NULLPTR);
 
     friend class QWebEnginePagePrivate;
     friend class QWebEngineUrlSchemeHandler;
diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h
index 6dc1b539b..0ba728c94 100644
--- a/src/webenginewidgets/api/qwebenginesettings.h
+++ b/src/webenginewidgets/api/qwebenginesettings.h
@@ -114,7 +114,7 @@ private:
     friend class QWebEngineProfilePrivate;
 
     ~QWebEngineSettings();
-    explicit QWebEngineSettings(QWebEngineSettings *parentSettings = 0);
+    explicit QWebEngineSettings(QWebEngineSettings *parentSettings = Q_NULLPTR);
 };
 
 QT_END_NAMESPACE
diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h
index f7e846861..cb66bb75f 100644
--- a/src/webenginewidgets/api/qwebengineview.h
+++ b/src/webenginewidgets/api/qwebengineview.h
@@ -65,7 +65,7 @@ class QWEBENGINEWIDGETS_EXPORT QWebEngineView : public QWidget {
     Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
 
 public:
-    explicit QWebEngineView(QWidget* parent = 0);
+    explicit QWebEngineView(QWidget* parent = Q_NULLPTR);
     virtual ~QWebEngineView();
 
     QWebEnginePage* page() const;
@@ -95,10 +95,10 @@ public:
     void setZoomFactor(qreal factor);
 
 #ifdef Q_QDOC
-    void findText(const QString &subString, QWebEnginePage::FindFlags options = 0);
+    void findText(const QString &subString, QWebEnginePage::FindFlags options = QWebEnginePage::FindFlags());
     void findText(const QString &subString, QWebEnginePage::FindFlags options, FunctorOrLambda resultCallback);
 #else
-    void findText(const QString &subString, QWebEnginePage::FindFlags options = 0, const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
+    void findText(const QString &subString, QWebEnginePage::FindFlags options = QWebEnginePage::FindFlags(), const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
 #endif
 
     virtual QSize sizeHint() const Q_DECL_OVERRIDE;
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index 0eaa7cbd0..fab4827a0 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -39,7 +39,8 @@
     and findText().
 
     A page can be loaded using load() or setUrl(). Alternatively, if you have
-    the HTML content readily available, you can use setHtml().
+    the HTML content readily available, you can use setHtml(). The GET method is
+    always used to load URLs.
 
     The QWebEnginePage class also offers methods to retrieve both the URL currently
     loaded by the page (see url()) as well as the URL originally requested
diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
index feaa802d7..5a4c1b52b 100644
--- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
@@ -37,8 +37,10 @@
     It can be used in various applications to display web content live from the
     Internet.
 
-    A \e {web site} can be loaded to a web view with the load() function. Like all
-    Qt widgets, the show() function must be invoked in order to display
+    A \e {web site} can be loaded to a web view with the load() function. The
+    GET method is always used to load URLs.
+
+    Like all Qt widgets, the show() function must be invoked in order to display
     the web view. The snippet below illustrates this:
 
     \snippet simple/main.cpp Using QWebEngineView