diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2020-01-16 11:50:07 +0100 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2020-01-17 10:31:50 +0000 |
| commit | 3bbfff059e381412e2976b1e7dc1d6626280f0c0 (patch) | |
| tree | 98e726024451d0806248829da4da5ec371745ba8 | |
| parent | 0f7953646c107d5227b8daf2a2464618eee1fddf (diff) | |
| download | qtwebengine-chromium-3bbfff059e381412e2976b1e7dc1d6626280f0c0.tar.gz | |
FIXUP: Support GPU service on UI thread with viz
Expose VizCompositorThreadRunner in order to call CleanupForShutdown.
Change-Id: I454fb74d55e187cdd823fa258c17356859465a63
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/components/viz/service/main/viz_main_impl.h | 4 | ||||
| -rw-r--r-- | chromium/content/gpu/gpu_child_thread.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/chromium/components/viz/service/main/viz_main_impl.h b/chromium/components/viz/service/main/viz_main_impl.h index c7cb93e4550..6d162126699 100644 --- a/chromium/components/viz/service/main/viz_main_impl.h +++ b/chromium/components/viz/service/main/viz_main_impl.h @@ -130,6 +130,10 @@ class VizMainImpl : public mojom::VizMain { // Cleanly exits the process. void ExitProcess(); + VizCompositorThreadRunner* viz_compositor_thread_runner() { + return viz_compositor_thread_runner_.get(); + } + private: // Initializes GPU's UkmRecorder if GPU is running in it's own process. void CreateUkmRecorderIfNeeded(service_manager::Connector* connector); diff --git a/chromium/content/gpu/gpu_child_thread.h b/chromium/content/gpu/gpu_child_thread.h index b999ac3b2ff..5d4b625dba0 100644 --- a/chromium/content/gpu/gpu_child_thread.h +++ b/chromium/content/gpu/gpu_child_thread.h @@ -65,6 +65,8 @@ class GpuChildThread : public ChildThreadImpl, return viz_main_.gpu_service()->gpu_channel_manager(); } + viz::VizMainImpl *viz_main() { return &viz_main_; } + private: GpuChildThread(base::RepeatingClosure quit_closure, const ChildThreadImpl::Options& options, |