From be1ee6225d050ffda153b19f9ff2b12f7b60b7d8 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 18 Jan 2023 23:24:37 +0100
Subject: Drop dependency on content/public/browser in content gpu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We include header from content/public/browser which includes
generated headers, however we do not have that dependency
on content gpu. This creates build race condition as generated
headers might to be in place. Unfortunately adding that dependency
causes some gn asserts, as this dependency should not be allowed.
Therefore, move GetInProcessGpuShareGroup from browser content
to gpu content, where it make more sense.

Change-Id: I9dfc37ddf7466ca7b431a31b379e811583790467
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/455058
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit 406715225b17b2cf4204f17b9b651bef5d397392)
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/455128
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 chromium/content/public/browser/content_browser_client.h | 8 --------
 chromium/content/public/gpu/content_gpu_client.cc        | 4 ++++
 chromium/content/public/gpu/content_gpu_client.h         | 7 +++++++
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'chromium/content/public')

diff --git a/chromium/content/public/browser/content_browser_client.h b/chromium/content/public/browser/content_browser_client.h
index 853b4588d06..290c71951ed 100644
--- a/chromium/content/public/browser/content_browser_client.h
+++ b/chromium/content/public/browser/content_browser_client.h
@@ -119,10 +119,6 @@ namespace gfx {
 class ImageSkia;
 }  // namespace gfx
 
-namespace gl {
-class GLShareGroup;
-}
-
 namespace media {
 class AudioLogFactory;
 class AudioManager;
@@ -1144,10 +1140,6 @@ class CONTENT_EXPORT ContentBrowserClient {
       std::vector<std::unique_ptr<storage::FileSystemBackend>>*
           additional_backends) {}
 
-  // Allow an embedder to provide a share group reimplementation to connect renderer
-  // GL contexts with the root compositor.
-  virtual gl::GLShareGroup* GetInProcessGpuShareGroup() { return nullptr; }
-
   // Creates a new DevToolsManagerDelegate. It's valid to return nullptr.
   virtual std::unique_ptr<content::DevToolsManagerDelegate>
   CreateDevToolsManagerDelegate();
diff --git a/chromium/content/public/gpu/content_gpu_client.cc b/chromium/content/public/gpu/content_gpu_client.cc
index 905b69c2e3c..3f297e3551e 100644
--- a/chromium/content/public/gpu/content_gpu_client.cc
+++ b/chromium/content/public/gpu/content_gpu_client.cc
@@ -23,4 +23,8 @@ ContentGpuClient::GetVizCompositorThreadRunner() {
   return nullptr;
 }
 
+gl::GLShareGroup* ContentGpuClient::GetInProcessGpuShareGroup() {
+  return nullptr;
+}
+
 }  // namespace content
diff --git a/chromium/content/public/gpu/content_gpu_client.h b/chromium/content/public/gpu/content_gpu_client.h
index 3020e59f491..77ca2032a6f 100644
--- a/chromium/content/public/gpu/content_gpu_client.h
+++ b/chromium/content/public/gpu/content_gpu_client.h
@@ -19,6 +19,10 @@ class SharedImageManager;
 class SyncPointManager;
 }
 
+namespace gl {
+class GLShareGroup;
+}
+
 namespace viz {
 class VizCompositorThreadRunner;
 }
@@ -55,6 +59,9 @@ class CONTENT_EXPORT ContentGpuClient {
   virtual gpu::SharedImageManager* GetSharedImageManager();
   virtual gpu::Scheduler* GetScheduler();
   virtual viz::VizCompositorThreadRunner* GetVizCompositorThreadRunner();
+  // Allow an embedder to provide a share group reimplementation to connect renderer
+  // GL contexts with the root compositor.
+  virtual gl::GLShareGroup* GetInProcessGpuShareGroup();
 };
 
 }  // namespace content
-- 
cgit v1.2.1