diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-22 20:08:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-22 20:15:13 +0200 |
| commit | 29e75ab2ede9e13321faeec61e1d77f3caa6118c (patch) | |
| tree | bafd4479f5a84db963eef0c04e7a5d86627f6691 /src/core/renderer/content_renderer_client_qt.cpp | |
| parent | 98702f186c66a6eedb90b5d4823c53afd8794770 (diff) | |
| parent | bb6fffd1ad3168edc9d67492cca585084d8ae6b4 (diff) | |
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
Diffstat (limited to 'src/core/renderer/content_renderer_client_qt.cpp')
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 5 |
1 files changed, 5 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, |