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

Conflicts:
	src/core/certificate_error_controller.cpp
	src/core/compositor/display_gl_output_surface_qsg.cpp
	src/webengine/doc/src/webengine_certificate_error.qdoc
	tests/auto/quick/qmltests/data/tst_certificateError.qml

Change-Id: I976958a0833030bfd7c3ed762585eb12031306b0

2 files changed, 6 insertions, 0 deletions

diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index 7567775fb..8c70f2e42 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -362,6 +362,11 @@ bool ContentRendererClientQt::OverrideCreatePlugin(content::RenderFrame *render_
     return content::ContentRendererClient::OverrideCreatePlugin(render_frame, params, plugin);
 }
 
+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,
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index 3cbd5b9ee..24a841cb8 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -114,6 +114,7 @@ public:
     bool OverrideCreatePlugin(content::RenderFrame *render_frame,
                               const blink::WebPluginParams &params,
                               blink::WebPlugin **plugin) override;
+    bool IsOriginIsolatedPepperPlugin(const base::FilePath& plugin_path) override;
     content::BrowserPluginDelegate *CreateBrowserPluginDelegate(content::RenderFrame *render_frame,
                                                                 const content::WebPluginInfo &info,
                                                                 const std::string &mime_type,