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

Change-Id: I0dd7c64669f4b130047a4a3836f62f7ee5b5f8d9

5 files changed, 64 insertions, 26 deletions

diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index 86cc5d52a..ed7f98f23 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -90,6 +90,8 @@
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "common/extensions/extensions_client_qt.h"
 #include "extensions/extensions_renderer_client_qt.h"
+#include "extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container_manager.h"
+#include "mojo/public/cpp/bindings/associated_remote.h"
 #endif //ENABLE_EXTENSIONS
 
 #if BUILDFLAG(ENABLE_PLUGINS)
@@ -219,6 +221,11 @@ void ContentRendererClientQt::RenderFrameCreated(content::RenderFrame *render_fr
     new printing::PrintRenderFrameHelper(render_frame, base::WrapUnique(new PrintWebViewHelperDelegateQt()));
 #endif // QT_CONFIG(webengine_printing_and_pdf)
 #if BUILDFLAG(ENABLE_EXTENSIONS)
+    blink::AssociatedInterfaceRegistry *associated_interfaces = render_frame_observer->associatedInterfaces();
+    associated_interfaces->AddInterface(base::BindRepeating(
+        &extensions::MimeHandlerViewContainerManager::BindReceiver,
+        render_frame->GetRoutingID()));
+
     auto registry = std::make_unique<service_manager::BinderRegistry>();
     ExtensionsRendererClientQt::GetInstance()->RenderFrameCreated(render_frame, render_frame_observer->registry());
 #endif
@@ -336,6 +343,30 @@ std::unique_ptr<blink::WebPrescientNetworking> ContentRendererClientQt::CreatePr
     return std::make_unique<network_hints::WebPrescientNetworkingImpl>(render_frame);
 }
 
+bool ContentRendererClientQt::IsPluginHandledExternally(content::RenderFrame *render_frame,
+                                   const blink::WebElement &plugin_element,
+                                   const GURL &original_url,
+                                   const std::string &original_mime_type)
+{
+#if BUILDFLAG(ENABLE_EXTENSIONS) && BUILDFLAG(ENABLE_PLUGINS)
+    bool found = false;
+    content::WebPluginInfo plugin_info;
+    std::string mime_type;
+
+    render_frame->Send(new FrameHostMsg_GetPluginInfo(render_frame->GetRoutingID(), original_url,
+                                                      render_frame->GetWebFrame()->Top()->GetSecurityOrigin(),
+                                                      original_mime_type, &found, &plugin_info, &mime_type));
+
+    return extensions::MimeHandlerViewContainerManager::Get(
+                content::RenderFrame::FromWebFrame(
+                    plugin_element.GetDocument().GetFrame()),
+                true /* create_if_does_not_exist */)
+                    ->CreateFrameContainer(plugin_element, original_url, mime_type, plugin_info);
+#else
+    return false;
+#endif
+}
+
 bool ContentRendererClientQt::OverrideCreatePlugin(content::RenderFrame *render_frame,
                                                    const blink::WebPluginParams &params,
                                                    blink::WebPlugin **plugin)
@@ -346,7 +377,6 @@ bool ContentRendererClientQt::OverrideCreatePlugin(content::RenderFrame *render_
 #endif //ENABLE_EXTENSIONS
 
 #if BUILDFLAG(ENABLE_PLUGINS)
-    chrome::mojom::PluginInfoPtr plugin_info = chrome::mojom::PluginInfo::New();
     content::WebPluginInfo info;
     std::string mime_type;
     bool found = false;
@@ -354,30 +384,18 @@ bool ContentRendererClientQt::OverrideCreatePlugin(content::RenderFrame *render_
     render_frame->Send(new FrameHostMsg_GetPluginInfo(render_frame->GetRoutingID(), params.url,
                                                       render_frame->GetWebFrame()->Top()->GetSecurityOrigin(),
                                                       params.mime_type.Utf8(), &found, &info, &mime_type));
-    if (!found) {
-        *plugin = CreatePlugin(render_frame, params, *plugin_info);
-        return true;
-    }
+    if (!found)
+        *plugin = LoadablePluginPlaceholderQt::CreateLoadableMissingPlugin(render_frame, params)->plugin();
+    else
+        *plugin = render_frame->CreatePlugin(info, params, nullptr);
 #endif  // BUILDFLAG(ENABLE_PLUGINS)
-    return content::ContentRendererClient::OverrideCreatePlugin(render_frame, params, plugin);
+    return true;
 }
 
 bool ContentRendererClientQt::IsOriginIsolatedPepperPlugin(const base::FilePath& plugin_path)
 {
-    return plugin_path.value() == FILE_PATH_LITERAL("internal-pdf-viewer/");
-}
-
-#if BUILDFLAG(ENABLE_PLUGINS)
-// static
-blink::WebPlugin* ContentRendererClientQt::CreatePlugin(content::RenderFrame* render_frame,
-                                                        const blink::WebPluginParams& original_params,
-                                                        const chrome::mojom::PluginInfo& plugin_info)
-{
-    // If the browser plugin is to be enabled, this should be handled by the
-    // renderer, so the code won't reach here due to the early exit in OverrideCreatePlugin.
-    return LoadablePluginPlaceholderQt::CreateLoadableMissingPlugin(render_frame, original_params)->plugin();
+    return plugin_path.value() == FILE_PATH_LITERAL("internal-pdf-viewer");
 }
-#endif  //BUILDFLAG(ENABLE_PLUGINS)
 
 #if QT_CONFIG(webengine_webrtc) && QT_CONFIG(webengine_extensions)
 chrome::WebRtcLoggingAgentImpl *ContentRendererClientQt::GetWebRtcLoggingAgent()
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index 0b0a7b68c..a0faec531 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -47,7 +47,6 @@
 #include "ppapi/buildflags/buildflags.h"
 
 #if BUILDFLAG(ENABLE_PLUGINS)
-#include "qtwebengine/browser/plugin.mojom.h"
 #include "third_party/blink/public/web/web_plugin_params.h"
 #endif
 
@@ -113,6 +112,10 @@ public:
     void RunScriptsAtDocumentStart(content::RenderFrame *render_frame) override;
     void RunScriptsAtDocumentEnd(content::RenderFrame *render_frame) override;
     void RunScriptsAtDocumentIdle(content::RenderFrame *render_frame) override;
+    bool IsPluginHandledExternally(content::RenderFrame *embedder_frame,
+                                   const blink::WebElement &plugin_element,
+                                   const GURL &original_url,
+                                   const std::string &original_mime_type);
     bool OverrideCreatePlugin(content::RenderFrame *render_frame,
                               const blink::WebPluginParams &params,
                               blink::WebPlugin **plugin) override;
@@ -128,12 +131,6 @@ public:
 
     bool RequiresWebComponentsV0(const GURL &url) override;
 
-#if BUILDFLAG(ENABLE_PLUGINS)
-    static blink::WebPlugin* CreatePlugin(content::RenderFrame* render_frame,
-                                          const blink::WebPluginParams& params,
-                                          const chrome::mojom::PluginInfo& plugin_info);
-#endif
-
 #if QT_CONFIG(webengine_webrtc) && QT_CONFIG(webengine_extensions)
     chrome::WebRtcLoggingAgentImpl *GetWebRtcLoggingAgent();
 #endif
diff --git a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp
index 33c744f13..1b9de4d4d 100644
--- a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp
+++ b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp
@@ -48,6 +48,7 @@
 
 #include "base/memory/ptr_util.h"
 #include "chrome/renderer/pepper/pepper_flash_font_file_host.h"
+#include "chrome/renderer/pepper/pepper_uma_host.h"
 #if QT_CONFIG(webengine_printing_and_pdf)
 #include "components/pdf/renderer/pepper_pdf_host.h"
 #endif // QT_CONFIG(webengine_printing_and_pdf)
@@ -127,6 +128,14 @@ std::unique_ptr<ppapi::host::ResourceHost> PepperRendererHostFactoryQt::CreateRe
         }
     }
 #endif // QT_CONFIG(webengine_printing_and_pdf)
+
+    // Create a default ResourceHost for this message type to suppress
+    // "Failed to create PPAPI resource host" console error message.
+    switch (message.type()) {
+    case PpapiHostMsg_UMA_Create::ID:
+        return std::make_unique<ppapi::host::ResourceHost>(host_->GetPpapiHost(), instance, resource);
+    }
+
     return nullptr;
 }
 
diff --git a/src/core/renderer/render_frame_observer_qt.cpp b/src/core/renderer/render_frame_observer_qt.cpp
index fd900c292..77d325f3c 100644
--- a/src/core/renderer/render_frame_observer_qt.cpp
+++ b/src/core/renderer/render_frame_observer_qt.cpp
@@ -77,6 +77,12 @@ void RenderFrameObserverQt::DidCreatePepperPlugin(content::RendererPpapiHost *ho
 }
 #endif
 
+bool RenderFrameObserverQt::OnAssociatedInterfaceRequestForFrame(const std::string &interface_name,
+                                                                 mojo::ScopedInterfaceEndpointHandle *handle)
+{
+    return m_associated_interfaces.TryBindInterface(interface_name, handle);
+}
+
 void RenderFrameObserverQt::WillDetach()
 {
     m_isFrameDetached = true;
diff --git a/src/core/renderer/render_frame_observer_qt.h b/src/core/renderer/render_frame_observer_qt.h
index 237185f8c..8803dde89 100644
--- a/src/core/renderer/render_frame_observer_qt.h
+++ b/src/core/renderer/render_frame_observer_qt.h
@@ -46,6 +46,7 @@
 #include "content/public/renderer/render_frame_observer_tracker.h"
 #include "ppapi/buildflags/buildflags.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
+#include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
 
 namespace content {
 class RenderFrame;
@@ -67,12 +68,18 @@ public:
 #if QT_CONFIG(webengine_pepper_plugins)
     void DidCreatePepperPlugin(content::RendererPpapiHost *host) override;
 #endif
+    bool OnAssociatedInterfaceRequestForFrame(
+        const std::string &interface_name,
+        mojo::ScopedInterfaceEndpointHandle *handle) override;
     void OnDestruct() override;
     void WillDetach() override;
 
     bool isFrameDetached() const;
 
     service_manager::BinderRegistry *registry() { return &registry_; }
+    blink::AssociatedInterfaceRegistry *associatedInterfaces() {
+        return &m_associated_interfaces;
+    }
 
 private:
     DISALLOW_COPY_AND_ASSIGN(RenderFrameObserverQt);
@@ -81,6 +88,7 @@ private:
 
     bool m_isFrameDetached;
     service_manager::BinderRegistry registry_;
+    blink::AssociatedInterfaceRegistry m_associated_interfaces;
     web_cache::WebCacheImpl *m_web_cache_impl;
 };