Implement ContentGpuClient for WebEngine

This is the way we are supposed to share a sync point manager with the
content layer.

Change-Id: I595caa863f8b9c8b4f4bc17df76211416a027a12
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

10 files changed, 155 insertions, 22 deletions

diff --git a/src/core/compositor/chromium_gpu_helper.cpp b/src/core/compositor/chromium_gpu_helper.cpp
index 92a8b13ed..2164f434f 100644
--- a/src/core/compositor/chromium_gpu_helper.cpp
+++ b/src/core/compositor/chromium_gpu_helper.cpp
@@ -46,7 +46,6 @@
 // Including gpu/command_buffer headers before content/gpu headers makes sure that
 // guards are defined to prevent duplicate definition errors with forward declared
 // GL typedefs cascading through content header includes.
-#include "gpu/command_buffer/service/sync_point_manager.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/texture_base.h"
 
@@ -62,12 +61,6 @@ scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner()
     return content::GpuChildThread::instance()->main_thread_runner();
 }
 
-gpu::SyncPointManager *sync_point_manager()
-{
-    gpu::GpuChannelManager *gpuChannelManager = content::GpuChildThread::instance()->gpu_channel_manager();
-    return gpuChannelManager->sync_point_manager();
-}
-
 gpu::MailboxManager *mailbox_manager()
 {
     gpu::GpuChannelManager *gpuChannelManager = content::GpuChildThread::instance()->gpu_channel_manager();
diff --git a/src/core/compositor/chromium_gpu_helper.h b/src/core/compositor/chromium_gpu_helper.h
index 21b764997..c2799204b 100644
--- a/src/core/compositor/chromium_gpu_helper.h
+++ b/src/core/compositor/chromium_gpu_helper.h
@@ -50,7 +50,6 @@ class SingleThreadTaskRunner;
 
 namespace gpu {
 struct Mailbox;
-class SyncPointManager;
 class MailboxManager;
 class TextureBase;
 }
@@ -61,7 +60,6 @@ class TextureBase;
 // functions should only be forward-declared and considered as opaque types.
 
 scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner();
-gpu::SyncPointManager *sync_point_manager();
 gpu::MailboxManager *mailbox_manager();
 
 gpu::TextureBase* ConsumeTexture(gpu::MailboxManager *mailboxManager, unsigned target, const gpu::Mailbox& mailbox);
diff --git a/src/core/compositor/compositor_resource_tracker.cpp b/src/core/compositor/compositor_resource_tracker.cpp
index 74c718042..90f98191c 100644
--- a/src/core/compositor/compositor_resource_tracker.cpp
+++ b/src/core/compositor/compositor_resource_tracker.cpp
@@ -41,15 +41,17 @@
 
 #include "chromium_gpu_helper.h"
 #include "render_widget_host_view_qt_delegate.h"
-
-#include <base/message_loop/message_loop.h>
-#include <components/viz/common/quads/compositor_frame.h>
-#include <components/viz/common/resources/returned_resource.h>
-#include <components/viz/service/display_embedder/server_shared_bitmap_manager.h>
-#include <content/browser/browser_main_loop.h>
-#include <content/public/browser/browser_thread.h>
-#include <gpu/command_buffer/service/mailbox_manager.h>
-#include <gpu/command_buffer/service/sync_point_manager.h>
+#include "web_engine_context.h"
+
+#include "base/message_loop/message_loop.h"
+#include "components/viz/common/quads/compositor_frame.h"
+#include "components/viz/common/resources/returned_resource.h"
+#include "components/viz/service/display_embedder/server_shared_bitmap_manager.h"
+#include "content/browser/browser_main_loop.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/gpu/content_gpu_client.h"
+#include "gpu/command_buffer/service/mailbox_manager.h"
+#include "gpu/command_buffer/service/sync_point_manager.h"
 
 namespace QtWebEngineCore {
 
@@ -179,7 +181,7 @@ quint32 CompositorResourceTracker::consumeMailbox(const gpu::MailboxHolder &mail
 bool CompositorResourceTracker::scheduleUpdateMailbox(CompositorResource *resource)
 {
 #if QT_CONFIG(opengl)
-    gpu::SyncPointManager *syncPointManager = sync_point_manager();
+    gpu::SyncPointManager *syncPointManager = WebEngineContext::current()->syncPointManager();
     DCHECK(syncPointManager);
     return syncPointManager->WaitOutOfOrder(
         resource->mailbox_holder.sync_token,
diff --git a/src/core/compositor/content_gpu_client_qt.cpp b/src/core/compositor/content_gpu_client_qt.cpp
new file mode 100644
index 000000000..0317b503a
--- /dev/null
+++ b/src/core/compositor/content_gpu_client_qt.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "content_gpu_client_qt.h"
+
+#include "web_engine_context.h"
+
+namespace QtWebEngineCore {
+
+ContentGpuClientQt::ContentGpuClientQt()
+{
+}
+
+ContentGpuClientQt::~ContentGpuClientQt()
+{
+}
+
+gpu::SyncPointManager *ContentGpuClientQt::GetSyncPointManager()
+{
+    WebEngineContext *current = WebEngineContext::current();
+    Q_ASSERT(current);
+    return current->syncPointManager();
+}
+
+} // namespace
diff --git a/src/core/compositor/content_gpu_client_qt.h b/src/core/compositor/content_gpu_client_qt.h
new file mode 100644
index 000000000..d7ad43881
--- /dev/null
+++ b/src/core/compositor/content_gpu_client_qt.h
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef CONTENT_GPU_CLIENT_QT_H
+#define CONTENT_GPU_CLIENT_QT_H
+
+#include "content/public/gpu/content_gpu_client.h"
+
+namespace QtWebEngineCore {
+
+class ContentGpuClientQt : public content::ContentGpuClient {
+public:
+    explicit ContentGpuClientQt();
+    ~ContentGpuClientQt() override;
+
+    // content::ContentGpuClient implementation.
+    gpu::SyncPointManager *GetSyncPointManager() override;
+};
+
+}
+
+#endif // CONTENT_GPU_CLIENT_QT_H
diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp
index 2811d5545..52895e312 100644
--- a/src/core/content_main_delegate_qt.cpp
+++ b/src/core/content_main_delegate_qt.cpp
@@ -40,17 +40,17 @@
 #include "content_main_delegate_qt.h"
 
 #include "base/command_line.h"
-#include <base/i18n/rtl.h>
+#include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
-#include <chrome/grit/generated_resources.h>
+#include "chrome/grit/generated_resources.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/resource/resource_bundle.h"
-#include <ui/base/webui/jstemplate_builder.h>
+#include "ui/base/webui/jstemplate_builder.h"
 #include "net/grit/net_resources.h"
 #include "net/base/net_module.h"
 #include "services/service_manager/sandbox/switches.h"
@@ -59,6 +59,7 @@
 #include "content_client_qt.h"
 #include "renderer/content_renderer_client_qt.h"
 #include "type_conversion.h"
+#include "web_engine_context.h"
 #include "web_engine_library_info.h"
 
 #if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX))
@@ -167,6 +168,12 @@ content::ContentBrowserClient *ContentMainDelegateQt::CreateContentBrowserClient
     return m_browserClient.get();
 }
 
+content::ContentGpuClient *ContentMainDelegateQt::CreateContentGpuClient()
+{
+    m_gpuClient.reset(new ContentGpuClientQt);
+    return m_gpuClient.get();
+}
+
 content::ContentRendererClient *ContentMainDelegateQt::CreateContentRendererClient()
 {
 #if defined(OS_LINUX)
diff --git a/src/core/content_main_delegate_qt.h b/src/core/content_main_delegate_qt.h
index c06afb0fb..4d2f33792 100644
--- a/src/core/content_main_delegate_qt.h
+++ b/src/core/content_main_delegate_qt.h
@@ -42,6 +42,7 @@
 
 #include "content/public/app/content_main_delegate.h"
 
+#include "compositor/content_gpu_client_qt.h"
 #include "content_browser_client_qt.h"
 #include "content_utility_client_qt.h"
 
@@ -56,12 +57,14 @@ public:
     void PreSandboxStartup() override;
 
     content::ContentBrowserClient* CreateContentBrowserClient() override;
+    content::ContentGpuClient* CreateContentGpuClient() override;
     content::ContentRendererClient* CreateContentRendererClient() override;
     content::ContentUtilityClient* CreateContentUtilityClient() override;
     bool BasicStartupComplete(int* /*exit_code*/) override;
 
 private:
     std::unique_ptr<ContentBrowserClientQt> m_browserClient;
+    std::unique_ptr<ContentGpuClientQt> m_gpuClient;
     std::unique_ptr<ContentUtilityClientQt> m_utilityClient;
 };
 
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index e6ccdc848..f8d97c123 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -57,6 +57,7 @@ SOURCES = \
         compositor/chromium_gpu_helper.cpp \
         compositor/compositor.cpp \
         compositor/compositor_resource_tracker.cpp \
+        compositor/content_gpu_client_qt.cpp \
         compositor/delegated_frame_node.cpp \
         content_client_qt.cpp \
         content_browser_client_qt.cpp \
@@ -149,6 +150,7 @@ HEADERS = \
         compositor/compositor.h \
         compositor/compositor_resource.h \
         compositor/compositor_resource_tracker.h \
+        compositor/content_gpu_client_qt.h \
         compositor/delegated_frame_node.h \
         content_client_qt.h \
         content_browser_client_qt.h \
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index e88c5af19..a1c647f40 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -328,6 +328,7 @@ static void appendToFeatureSwitch(base::CommandLine *commandLine, const char *fe
 WebEngineContext::WebEngineContext()
     : m_mainDelegate(new ContentMainDelegateQt)
     , m_globalQObject(new QObject())
+    , m_syncPointManager(new gpu::SyncPointManager())
 {
     base::TaskScheduler::Create("Browser");
     m_contentRunner.reset(content::ContentMainRunner::Create());
@@ -612,4 +613,9 @@ printing::PrintJobManager* WebEngineContext::getPrintJobManager()
 }
 #endif
 
+gpu::SyncPointManager *WebEngineContext::syncPointManager()
+{
+    return m_syncPointManager.get();
+}
+
 } // namespace
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h
index cca14194d..f588918a7 100644
--- a/src/core/web_engine_context.h
+++ b/src/core/web_engine_context.h
@@ -59,6 +59,7 @@ class InProcessChildThreadParams;
 
 namespace gpu {
 struct GpuPreferences;
+class SyncPointManager;
 }
 
 #if QT_CONFIG(webengine_printing_and_pdf)
@@ -94,6 +95,8 @@ public:
     void removeBrowserContext(ProfileAdapter *profileAdapter);
     void destroy();
 
+    gpu::SyncPointManager *syncPointManager();
+
 private:
     friend class base::RefCounted<WebEngineContext>;
     friend class ProfileAdapter;
@@ -110,6 +113,7 @@ 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;
 
 #if QT_CONFIG(webengine_printing_and_pdf)