summaryrefslogtreecommitdiff
path: root/chromium/content/gpu/gpu_child_thread.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-08-04 18:07:02 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-05-03 10:57:05 +0200
commitabce808ab70dc38feeaced0de07632b5a689ffbc (patch)
tree270c060b9bfbfdf961c8d84d3a5f92eb9097209c /chromium/content/gpu/gpu_child_thread.h
parentc119fb79698bee8017b88a80a9df329a7e63be55 (diff)
downloadqtwebengine-chromium-abce808ab70dc38feeaced0de07632b5a689ffbc.tar.gz
Add accessors and seams for the Qt delegated renderer integration.
This is needed to fetch the MessageLoop, the MailboxManager and the SyncPointManager of the GPU in-process host. And fetch the right shared context for the in GPU thread. Change-Id: I7f38e32b2df11da5b046f16643841d34260c11fb Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/content/gpu/gpu_child_thread.h')
-rw-r--r--chromium/content/gpu/gpu_child_thread.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/chromium/content/gpu/gpu_child_thread.h b/chromium/content/gpu/gpu_child_thread.h
index f44ce993d88..bac6fac97fd 100644
--- a/chromium/content/gpu/gpu_child_thread.h
+++ b/chromium/content/gpu/gpu_child_thread.h
@@ -84,6 +84,12 @@ class GpuChildThread : public ChildThreadImpl,
return gpu_service_->watchdog_thread();
}
+ static GpuChildThread* instance() { return instance_; }
+
+ gpu::GpuChannelManager* gpu_channel_manager() {
+ return gpu_service_->gpu_channel_manager();
+ }
+
private:
void CreateGpuMainService(ui::mojom::GpuMainAssociatedRequest request);
@@ -135,10 +141,6 @@ class GpuChildThread : public ChildThreadImpl,
void BindServiceFactoryRequest(
service_manager::mojom::ServiceFactoryRequest request);
- gpu::GpuChannelManager* gpu_channel_manager() {
- return gpu_service_->gpu_channel_manager();
- }
-
// Set this flag to true if a fatal error occurred before we receive the
// OnInitialize message, in which case we just declare ourselves DOA.
const bool dead_on_arrival_;
@@ -169,6 +171,8 @@ class GpuChildThread : public ChildThreadImpl,
std::unique_ptr<ui::GpuService> gpu_service_;
mojo::AssociatedBinding<ui::mojom::GpuMain> gpu_main_binding_;
+ static GpuChildThread* instance_;
+
DISALLOW_COPY_AND_ASSIGN(GpuChildThread);
};