diff options
author | Michal Klocek <michal.klocek@qt.io> | 2020-10-07 13:05:00 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2020-12-11 20:50:36 +0100 |
commit | 1fe372cdbdf6a6960e46c7555a9698c6b5d7e758 (patch) | |
tree | b03634cb1c41ea4a88ba8cbe0beb30dc1068ff3e /src/core/renderer/content_renderer_client_qt.h | |
parent | f6c4b79a31056aa83175b9ea073088063277ff6d (diff) |
Fix crashes in user resource controller when single process
Mojo interface when running in single process was not correctly
destructed, since we used user resource controller as global static object.
Move user resource controller to content render client.
Change-Id: I219510c9bc382545174aa5aae99ac8282a2049e6
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/renderer/content_renderer_client_qt.h')
-rw-r--r-- | src/core/renderer/content_renderer_client_qt.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h index 24a841cb8..3eb6be43a 100644 --- a/src/core/renderer/content_renderer_client_qt.h +++ b/src/core/renderer/content_renderer_client_qt.h @@ -73,10 +73,11 @@ namespace content { struct WebPluginInfo; } +class UserResourceController; + namespace QtWebEngineCore { class RenderThreadObserverQt; - class ContentRendererClientQt : public content::ContentRendererClient , public service_manager::LocalInterfaceProvider @@ -148,6 +149,7 @@ private: const error_page::Error &error, std::string *errorHtml); QScopedPointer<RenderThreadObserverQt> m_renderThreadObserver; + QScopedPointer<UserResourceController> m_userResourceController; QScopedPointer<visitedlink::VisitedLinkReader> m_visitedLinkReader; QScopedPointer<web_cache::WebCacheImpl> m_webCacheImpl; #if QT_CONFIG(webengine_spellchecker) |