diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-22 13:51:45 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-28 19:03:39 +0000 |
commit | e6e66c8a2db056f583627d0fb0be6152733d295f (patch) | |
tree | de8c2df853593123cebc18a2a8117f96949be420 /src/core/web_engine_context.h | |
parent | d3a6b236949a0197f998eeb58145c208552de4fe (diff) |
Adaptations for Chromium 71
Change-Id: Ib650113b05dfd4771240804f94e33c07aa317bf2
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core/web_engine_context.h')
-rw-r--r-- | src/core/web_engine_context.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h index b9af38153..ad02ddf4d 100644 --- a/src/core/web_engine_context.h +++ b/src/core/web_engine_context.h @@ -91,13 +91,12 @@ public: #if QT_CONFIG(webengine_printing_and_pdf) printing::PrintJobManager* getPrintJobManager(); #endif - void initialize(); void destroyProfileAdapter(); void addProfileAdapter(ProfileAdapter *profileAdapter); void removeProfileAdapter(ProfileAdapter *profileAdapter); void destroy(); - gpu::SyncPointManager *syncPointManager(); + static gpu::SyncPointManager *syncPointManager(); private: friend class base::RefCounted<WebEngineContext>; @@ -115,7 +114,6 @@ private: std::unique_ptr<QObject> m_globalQObject; std::unique_ptr<ProfileAdapter> m_defaultProfileAdapter; std::unique_ptr<DevToolsServerQt> m_devtoolsServer; - std::unique_ptr<gpu::SyncPointManager> m_syncPointManager; QVector<ProfileAdapter*> m_profileAdapters; #ifndef QT_NO_ACCESSIBILITY std::unique_ptr<AccessibilityActivationObserver> m_accessibilityActivationObserver; @@ -126,6 +124,7 @@ private: #endif static scoped_refptr<QtWebEngineCore::WebEngineContext> m_handle; static bool m_destroyed; + static QAtomicPointer<gpu::SyncPointManager> s_syncPointManager; }; } // namespace |