From e6e66c8a2db056f583627d0fb0be6152733d295f Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 22 Oct 2018 13:51:45 +0200
Subject: Adaptations for Chromium 71
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/core/web_engine_context.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/core/web_engine_context.h')

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
-- 
cgit v1.2.3