summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSzabolcs David <davidsz@inf.u-szeged.hu>2020-09-17 16:25:29 +0200
committerSzabolcs David <davidsz@inf.u-szeged.hu>2020-09-17 16:47:48 +0200
commitd701dcbf4d15e16e05b169828dd4e031e99c2625 (patch)
tree01fde8b5e9b4f83bee69388e83fbf6e1b6bea92d
parente33a7a7592ed8517ec83543d822178871f25b0c5 (diff)
Fix PDF viewer plugin
Add the missing implementation of ContentRendererClient::IsOriginIsolatedPepperPlugin(). Change-Id: Ic4157da6b373450e620ff46faedad213a69adfec Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/core/renderer/content_renderer_client_qt.cpp5
-rw-r--r--src/core/renderer/content_renderer_client_qt.h1
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 4786a20ae..9f1f5bcf3 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,