diff options
Diffstat (limited to 'src/core/renderer')
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 7 | ||||
| -rw-r--r-- | src/core/renderer/user_resource_controller.cpp | 11 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index fa1e20f24..f69a8b64f 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -152,7 +152,14 @@ void ContentRendererClientQt::RenderThreadStarted() blink::WebString file(blink::WebString::FromASCII("file")); blink::WebSecurityPolicy::AddOriginAccessAllowListEntry(qrc, file, blink::WebString(), true, network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority); + #if BUILDFLAG(ENABLE_EXTENSIONS) + // Allow the pdf viewer extension to access chrome resources + blink::WebURL pdfViewerExtension(blink::KURL("chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai")); + blink::WebString chromeResources(blink::WebString::FromASCII("chrome")); + blink::WebSecurityPolicy::AddOriginAccessAllowListEntry(pdfViewerExtension, chromeResources, blink::WebString(), true, + network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority); + ExtensionsRendererClientQt::GetInstance()->RenderThreadStarted(); #endif } diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp index 46f5de2c2..be5e6f043 100644 --- a/src/core/renderer/user_resource_controller.cpp +++ b/src/core/renderer/user_resource_controller.cpp @@ -138,7 +138,6 @@ public: private: // RenderFrameObserver implementation. void DidCommitProvisionalLoad(bool is_same_document_navigation, ui::PageTransition transition) override; - void DidClearWindowObject() override; void DidFinishDocumentLoad() override; void DidFinishLoad() override; void FrameDetached() override; @@ -241,14 +240,10 @@ void UserResourceController::RenderFrameObserverHelper::DidCommitProvisionalLoad // that the WebChannelTransportHost is ready to receive messages. m_runner.reset(new Runner(render_frame()->GetWebFrame())); -} -void UserResourceController::RenderFrameObserverHelper::DidClearWindowObject() -{ - // This is called both before and after DidCommitProvisionalLoad, non-null - // m_runner means it's after. - if (m_runner) - m_runner->run(UserScriptData::DocumentElementCreation); + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, + base::BindOnce(&Runner::run, m_runner->AsWeakPtr(), UserScriptData::DocumentElementCreation)); } void UserResourceController::RenderFrameObserverHelper::DidFinishDocumentLoad() |