| Index: content/browser/compositor/gpu_process_transport_factory.h
|
| diff --git a/content/browser/compositor/gpu_process_transport_factory.h b/content/browser/compositor/gpu_process_transport_factory.h
|
| index de913bc148c5eb9ea4e0211854eba1d731750391..2f960d3fab20ef4232621bfc9d3016466e9e2927 100644
|
| --- a/content/browser/compositor/gpu_process_transport_factory.h
|
| +++ b/content/browser/compositor/gpu_process_transport_factory.h
|
| @@ -79,6 +79,8 @@ class GpuProcessTransportFactory
|
| ui::ContextFactory* GetContextFactory() override;
|
| cc::SurfaceManager* GetSurfaceManager() override;
|
| display_compositor::GLHelper* GetGLHelper() override;
|
| + void SetGpuChannelEstablishFactory(
|
| + gpu::GpuChannelEstablishFactory* factory) override;
|
| #if defined(OS_MACOSX)
|
| void SetCompositorSuspendedForRecycle(ui::Compositor* compositor,
|
| bool suspended) override;
|
| @@ -90,9 +92,11 @@ class GpuProcessTransportFactory
|
| PerCompositorData* CreatePerCompositorData(ui::Compositor* compositor);
|
| std::unique_ptr<cc::SoftwareOutputDevice> CreateSoftwareOutputDevice(
|
| ui::Compositor* compositor);
|
| - void EstablishedGpuChannel(base::WeakPtr<ui::Compositor> compositor,
|
| - bool create_gpu_output_surface,
|
| - int num_attempts);
|
| + void EstablishedGpuChannel(
|
| + base::WeakPtr<ui::Compositor> compositor,
|
| + bool create_gpu_output_surface,
|
| + int num_attempts,
|
| + scoped_refptr<gpu::GpuChannelHost> established_channel_host);
|
|
|
| void OnLostMainThreadSharedContextInsideCallback();
|
| void OnLostMainThreadSharedContext();
|
| @@ -114,6 +118,8 @@ class GpuProcessTransportFactory
|
| scoped_refptr<cc::VulkanInProcessContextProvider>
|
| shared_vulkan_context_provider_;
|
|
|
| + gpu::GpuChannelEstablishFactory* gpu_channel_factory_ = nullptr;
|
| +
|
| #if defined(OS_WIN)
|
| std::unique_ptr<OutputDeviceBacking> software_backing_;
|
| #endif
|
|
|