Merge remote-tracking branch 'origin/5.15' into dev

Conflicts:
	configure.pri
	src/pdf/api/qpdfpagerenderer.h

Change-Id: I7e68277080e29238bbfe8511539ea75b2db89489

5 files changed, 56 insertions, 37 deletions

diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index f7c8a497b..b2138a82a 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -39,7 +39,6 @@
 
 #include "renderer/content_renderer_client_qt.h"
 
-#include "common/qt_messages.h"
 #include "extensions/buildflags/buildflags.h"
 #include "printing/buildflags/buildflags.h"
 #include "renderer/content_settings_observer_qt.h"
@@ -53,20 +52,20 @@
 #include "components/error_page/common/error.h"
 #include "components/error_page/common/error_page_params.h"
 #include "components/error_page/common/localized_error.h"
-#include "components/network_hints/renderer/prescient_networking_dispatcher.h"
+#include "components/network_hints/renderer/web_prescient_networking_impl.h"
 #if QT_CONFIG(webengine_printing_and_pdf)
 #include "components/printing/renderer/print_render_frame_helper.h"
 #endif
-#include "components/visitedlink/renderer/visitedlink_slave.h"
+#include "components/visitedlink/renderer/visitedlink_reader.h"
 #include "components/web_cache/renderer/web_cache_impl.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/child/child_thread.h"
-#include "content/public/common/service_manager_connection.h"
-#include "content/public/common/simple_connection_filter.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "media/base/key_system_properties.h"
 #include "media/media_buildflags.h"
+#include "mojo/public/cpp/bindings/binder_map.h"
 #include "net/base/net_errors.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
@@ -82,6 +81,7 @@
 #include "renderer/print_web_view_helper_delegate_qt.h"
 #endif
 
+#include "common/qt_messages.h"
 #include "renderer/render_frame_observer_qt.h"
 #include "renderer/render_view_observer_qt.h"
 #include "renderer/render_thread_observer_qt.h"
@@ -134,16 +134,9 @@ void ContentRendererClientQt::RenderThreadStarted()
 {
     content::RenderThread *renderThread = content::RenderThread::Get();
     m_renderThreadObserver.reset(new RenderThreadObserverQt());
-    m_visitedLinkSlave.reset(new visitedlink::VisitedLinkSlave);
+    m_visitedLinkReader.reset(new visitedlink::VisitedLinkReader);
     m_webCacheImpl.reset(new web_cache::WebCacheImpl());
 
-    m_prescientNetworkingDispatcher.reset(new network_hints::PrescientNetworkingDispatcher());
-
-    auto registry = std::make_unique<service_manager::BinderRegistry>();
-    registry->AddInterface(m_visitedLinkSlave->GetBindCallback(), base::ThreadTaskRunnerHandle::Get());
-    content::ChildThread::Get()->GetServiceManagerConnection()->AddConnectionFilter(
-            std::make_unique<content::SimpleConnectionFilter>(std::move(registry)));
-
     renderThread->AddObserver(m_renderThreadObserver.data());
     renderThread->AddObserver(UserResourceController::instance());
 
@@ -174,6 +167,26 @@ void ContentRendererClientQt::RenderThreadStarted()
 #endif
 }
 
+void ContentRendererClientQt::ExposeInterfacesToBrowser(mojo::BinderMap* binders)
+{
+    binders->Add(m_visitedLinkReader->GetBindCallback(), base::SequencedTaskRunnerHandle::Get());
+
+    binders->Add(base::BindRepeating(&web_cache::WebCacheImpl::BindReceiver,
+                                     base::Unretained(m_webCacheImpl.get())),
+                 base::SequencedTaskRunnerHandle::Get());
+
+#if QT_CONFIG(webengine_spellchecker)
+    binders->Add(base::BindRepeating(
+                         [](ContentRendererClientQt *client,
+                            mojo::PendingReceiver<spellcheck::mojom::SpellChecker> receiver) {
+                             if (!client->m_spellCheck)
+                                 client->InitSpellCheck();
+                             client->m_spellCheck->BindReceiver(std::move(receiver));
+                         }, this),
+                 base::SequencedTaskRunnerHandle::Get());
+#endif
+}
+
 void ContentRendererClientQt::RenderViewCreated(content::RenderView *render_view)
 {
     // RenderViewObservers destroy themselves with their RenderView.
@@ -298,7 +311,7 @@ void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderF
 
         resourceId = IDR_NET_ERROR_HTML;
 
-        std::string extracted_string = ui::ResourceBundle::GetSharedInstance().DecompressDataResource(resourceId);
+        std::string extracted_string = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(resourceId);
         const base::StringPiece template_html(extracted_string.data(), extracted_string.size());
         if (template_html.empty())
             NOTREACHED() << "unable to load template. ID: " << resourceId;
@@ -309,17 +322,17 @@ void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderF
 
 uint64_t ContentRendererClientQt::VisitedLinkHash(const char *canonicalUrl, size_t length)
 {
-    return m_visitedLinkSlave->ComputeURLFingerprint(canonicalUrl, length);
+    return m_visitedLinkReader->ComputeURLFingerprint(canonicalUrl, length);
 }
 
 bool ContentRendererClientQt::IsLinkVisited(uint64_t linkHash)
 {
-    return m_visitedLinkSlave->IsVisited(linkHash);
+    return m_visitedLinkReader->IsVisited(linkHash);
 }
 
-blink::WebPrescientNetworking *ContentRendererClientQt::GetPrescientNetworking()
+std::unique_ptr<blink::WebPrescientNetworking> ContentRendererClientQt::CreatePrescientNetworking(content::RenderFrame *render_frame)
 {
-    return m_prescientNetworkingDispatcher.get();
+    return std::make_unique<network_hints::WebPrescientNetworkingImpl>(render_frame);
 }
 
 bool ContentRendererClientQt::OverrideCreatePlugin(content::RenderFrame *render_frame,
@@ -586,25 +599,32 @@ void ContentRendererClientQt::AddSupportedKeySystems(std::vector<std::unique_ptr
 #if QT_CONFIG(webengine_spellchecker)
 void ContentRendererClientQt::InitSpellCheck()
 {
-    m_spellCheck.reset(new SpellCheck(&m_registry, this));
+    m_spellCheck.reset(new SpellCheck(this));
 }
 #endif
 
 void ContentRendererClientQt::WillSendRequest(blink::WebLocalFrame *frame,
                                               ui::PageTransition transition_type,
                                               const blink::WebURL &url,
+                                              const blink::WebURL &site_for_cookies,
                                               const url::Origin *initiator_origin,
                                               GURL *new_url,
                                               bool *attach_same_site_cookies)
 {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-    ExtensionsRendererClientQt::GetInstance()->WillSendRequest(frame, transition_type, url, initiator_origin, new_url,
-                                                               attach_same_site_cookies);
+    ExtensionsRendererClientQt::GetInstance()->WillSendRequest(frame, transition_type, url, /*site_for_cookies,*/
+                                                               initiator_origin, new_url, attach_same_site_cookies);
     if (!new_url->is_empty())
         return;
 #endif
-    content::ContentRendererClient::WillSendRequest(frame, transition_type, url, initiator_origin, new_url,
-                                                    attach_same_site_cookies);
+}
+
+bool ContentRendererClientQt::RequiresWebComponentsV0(const GURL &url)
+{
+    Q_UNUSED(url);
+    // Google services still presents pages using these features
+    // to Chromium 80 based browsers (YouTube in particular).
+    return true;
 }
 
 } // namespace QtWebEngineCore
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index da70d29a8..f2e725453 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -57,12 +57,8 @@ namespace error_page {
 class Error;
 }
 
-namespace network_hints {
-class PrescientNetworkingDispatcher;
-}
-
 namespace visitedlink {
-class VisitedLinkSlave;
+class VisitedLinkReader;
 }
 
 namespace web_cache {
@@ -91,6 +87,7 @@ public:
 
     // content::ContentRendererClient:
     void RenderThreadStarted() override;
+    void ExposeInterfacesToBrowser(mojo::BinderMap* binders) override;
     void RenderViewCreated(content::RenderView *render_view) override;
     void RenderFrameCreated(content::RenderFrame *render_frame) override;
     bool ShouldSuppressErrorPage(content::RenderFrame *, const GURL &) override;
@@ -108,7 +105,7 @@ public:
 
     uint64_t VisitedLinkHash(const char *canonical_url, size_t length) override;
     bool IsLinkVisited(uint64_t linkHash) override;
-    blink::WebPrescientNetworking *GetPrescientNetworking() override;
+    std::unique_ptr<blink::WebPrescientNetworking> CreatePrescientNetworking(content::RenderFrame *render_frame) override;
     void AddSupportedKeySystems(std::vector<std::unique_ptr<media::KeySystemProperties>> *key_systems) override;
 
     void RunScriptsAtDocumentStart(content::RenderFrame *render_frame) override;
@@ -125,11 +122,13 @@ public:
     void WillSendRequest(blink::WebLocalFrame *frame,
                          ui::PageTransition transition_type,
                          const blink::WebURL &url,
+                         const blink::WebURL &site_for_cookies,
                          const url::Origin *initiator_origin,
                          GURL *new_url,
                          bool *attach_same_site_cookies) override;
 
     void BindReceiverOnMainThread(mojo::GenericPendingReceiver receiver) override;
+    bool RequiresWebComponentsV0(const GURL &url) override;
 
 #if BUILDFLAG(ENABLE_PLUGINS)
     static blink::WebPlugin* CreatePlugin(content::RenderFrame* render_frame,
@@ -148,14 +147,13 @@ private:
                                            const error_page::Error &error, std::string *errorHtml);
 
     QScopedPointer<RenderThreadObserverQt> m_renderThreadObserver;
-    QScopedPointer<visitedlink::VisitedLinkSlave> m_visitedLinkSlave;
+    QScopedPointer<visitedlink::VisitedLinkReader> m_visitedLinkReader;
     QScopedPointer<web_cache::WebCacheImpl> m_webCacheImpl;
 #if QT_CONFIG(webengine_spellchecker)
     QScopedPointer<SpellCheck> m_spellCheck;
 #endif
 
     service_manager::BinderRegistry m_registry;
-    std::unique_ptr<network_hints::PrescientNetworkingDispatcher> m_prescientNetworkingDispatcher;
 
     DISALLOW_COPY_AND_ASSIGN(ContentRendererClientQt);
 };
diff --git a/src/core/renderer/content_settings_observer_qt.cpp b/src/core/renderer/content_settings_observer_qt.cpp
index fc7019367..df9b77037 100644
--- a/src/core/renderer/content_settings_observer_qt.cpp
+++ b/src/core/renderer/content_settings_observer_qt.cpp
@@ -59,8 +59,8 @@ namespace {
 
 bool IsUniqueFrame(blink::WebFrame *frame)
 {
-    return frame->GetSecurityOrigin().IsUnique() ||
-           frame->Top()->GetSecurityOrigin().IsUnique();
+    return frame->GetSecurityOrigin().IsOpaque() ||
+           frame->Top()->GetSecurityOrigin().IsOpaque();
 }
 
 } // namespace
@@ -139,14 +139,15 @@ void ContentSettingsObserverQt::RequestFileSystemAccessAsync(base::OnceCallback<
                                                              url::Origin(frame->Top()->GetSecurityOrigin()).GetURL()));
 }
 
-bool ContentSettingsObserverQt::AllowIndexedDB(const WebSecurityOrigin &origin)
+bool ContentSettingsObserverQt::AllowIndexedDB()
 {
     blink::WebFrame *frame = render_frame()->GetWebFrame();
     if (IsUniqueFrame(frame))
         return false;
 
     bool result = false;
-    Send(new QtWebEngineHostMsg_AllowIndexedDB(routing_id(), url::Origin(origin).GetURL(),
+    Send(new QtWebEngineHostMsg_AllowIndexedDB(routing_id(),
+                                               url::Origin(frame->GetSecurityOrigin()).GetURL(),
                                                url::Origin(frame->Top()->GetSecurityOrigin()).GetURL(), &result));
     return result;
 }
diff --git a/src/core/renderer/content_settings_observer_qt.h b/src/core/renderer/content_settings_observer_qt.h
index 71e1fbca5..0c69d289c 100644
--- a/src/core/renderer/content_settings_observer_qt.h
+++ b/src/core/renderer/content_settings_observer_qt.h
@@ -69,7 +69,7 @@ public:
     // blink::WebContentSettingsClient:
     bool AllowDatabase() override;
     void RequestFileSystemAccessAsync(base::OnceCallback<void(bool)> callback) override;
-    bool AllowIndexedDB(const blink::WebSecurityOrigin &origin) override;
+    bool AllowIndexedDB() override;
     bool AllowStorage(bool local) override;
 
 private:
diff --git a/src/core/renderer/render_view_observer_qt.cpp b/src/core/renderer/render_view_observer_qt.cpp
index 731d8b97d..5b0b9a77d 100644
--- a/src/core/renderer/render_view_observer_qt.cpp
+++ b/src/core/renderer/render_view_observer_qt.cpp
@@ -73,7 +73,7 @@ void RenderViewObserverQt::onFetchDocumentInnerText(quint64 requestId)
 
 void RenderViewObserverQt::onSetBackgroundColor(quint32 color)
 {
-    render_view()->GetWebView()->SetBaseBackgroundColor(color);
+    render_view()->GetWebView()->SetBaseBackgroundColorOverride(color);
 }
 
 void RenderViewObserverQt::OnDestruct()