Get rid of our sync point manager

We haven't needed our own since we got rid of the graphics node
integration.

Change-Id: I20b0fdb440c07e451d0e0152e8012ddf59e159cf
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit a3901dfc1f05e21cacded220188112a15df81f43)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

4 files changed, 0 insertions, 25 deletions

diff --git a/src/core/compositor/content_gpu_client_qt.cpp b/src/core/compositor/content_gpu_client_qt.cpp
index 9f3b00bb8..d12074d2e 100644
--- a/src/core/compositor/content_gpu_client_qt.cpp
+++ b/src/core/compositor/content_gpu_client_qt.cpp
@@ -15,11 +15,6 @@ ContentGpuClientQt::~ContentGpuClientQt()
 {
 }
 
-gpu::SyncPointManager *ContentGpuClientQt::GetSyncPointManager()
-{
-    return WebEngineContext::syncPointManager();
-}
-
 gl::GLShareGroup *ContentGpuClientQt::GetInProcessGpuShareGroup()
 {
     if (!m_shareGroupQt.get())
diff --git a/src/core/compositor/content_gpu_client_qt.h b/src/core/compositor/content_gpu_client_qt.h
index 150c257ae..33314e0bb 100644
--- a/src/core/compositor/content_gpu_client_qt.h
+++ b/src/core/compositor/content_gpu_client_qt.h
@@ -18,7 +18,6 @@ public:
     ~ContentGpuClientQt() override;
 
     // content::ContentGpuClient implementation.
-    gpu::SyncPointManager *GetSyncPointManager() override;
     gl::GLShareGroup *GetInProcessGpuShareGroup() override;
 
 private:
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 658c1bf29..095b0ed50 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -55,7 +55,6 @@
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/network_service_util.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
-#include "gpu/command_buffer/service/sync_point_manager.h"
 #include "gpu/config/gpu_finch_features.h"
 #include "media/audio/audio_manager.h"
 #include "media/base/media_switches.h"
@@ -475,7 +474,6 @@ WebEngineContext::~WebEngineContext()
     Q_ASSERT(!m_devtoolsServer);
     Q_ASSERT(!m_browserRunner);
     Q_ASSERT(m_profileAdapters.isEmpty());
-    delete s_syncPointManager.fetchAndStoreRelaxed(nullptr);
 }
 
 WebEngineContext *WebEngineContext::current()
@@ -833,19 +831,6 @@ WebRtcLogUploader *WebEngineContext::webRtcLogUploader()
 #endif
 
 
-static QMutex s_spmMutex;
-QAtomicPointer<gpu::SyncPointManager> WebEngineContext::s_syncPointManager;
-
-gpu::SyncPointManager *WebEngineContext::syncPointManager()
-{
-    if (gpu::SyncPointManager *spm = s_syncPointManager.loadAcquire())
-        return spm;
-    QMutexLocker lock(&s_spmMutex);
-    if (!s_syncPointManager)
-        s_syncPointManager.storeRelaxed(new gpu::SyncPointManager());
-    return s_syncPointManager.loadRelaxed();
-}
-
 base::CommandLine *WebEngineContext::initCommandLine(bool &useEmbeddedSwitches,
                                                      bool &enableGLSoftwareRendering)
 {
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h
index 6819d06f0..5a2fd4c3e 100644
--- a/src/core/web_engine_context.h
+++ b/src/core/web_engine_context.h
@@ -32,7 +32,6 @@ class DiscardableSharedMemoryManager;
 
 namespace gpu {
 struct GpuPreferences;
-class SyncPointManager;
 }
 
 #if QT_CONFIG(webengine_printing_and_pdf)
@@ -85,8 +84,6 @@ public:
     static base::CommandLine *initCommandLine(bool &useEmbeddedSwitches,
                                               bool &enableGLSoftwareRendering);
 
-    static gpu::SyncPointManager *syncPointManager();
-
     static bool isGpuServiceOnUIThread();
 
 private:
@@ -121,7 +118,6 @@ private:
     static scoped_refptr<QtWebEngineCore::WebEngineContext> m_handle;
     static bool m_destroyed;
     static bool m_closingDown;
-    static QAtomicPointer<gpu::SyncPointManager> s_syncPointManager;
 };
 
 } // namespace