| 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 b465fa7673bb8a9cf615f90b4bc7d2d3f6248b63..3a5c9acb3c1e4959f2970f5d40f57656c3f2afb4 100644
|
| --- a/content/browser/compositor/gpu_process_transport_factory.h
|
| +++ b/content/browser/compositor/gpu_process_transport_factory.h
|
| @@ -67,13 +67,13 @@ class GpuProcessTransportFactory
|
| void SetAuthoritativeVSyncInterval(ui::Compositor* compositor,
|
| base::TimeDelta interval) override;
|
| void SetOutputIsSecure(ui::Compositor* compositor, bool secure) override;
|
| + void AddObserver(ui::ContextFactoryObserver* observer) override;
|
| + void RemoveObserver(ui::ContextFactoryObserver* observer) override;
|
|
|
| // ImageTransportFactory implementation.
|
| ui::ContextFactory* GetContextFactory() override;
|
| cc::SurfaceManager* GetSurfaceManager() override;
|
| display_compositor::GLHelper* GetGLHelper() override;
|
| - void AddObserver(ImageTransportFactoryObserver* observer) override;
|
| - void RemoveObserver(ImageTransportFactoryObserver* observer) override;
|
| #if defined(OS_MACOSX)
|
| void SetCompositorSuspendedForRecycle(ui::Compositor* compositor,
|
| bool suspended) override;
|
| @@ -99,7 +99,7 @@ class GpuProcessTransportFactory
|
| PerCompositorDataMap per_compositor_data_;
|
| scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_;
|
| std::unique_ptr<display_compositor::GLHelper> gl_helper_;
|
| - base::ObserverList<ImageTransportFactoryObserver> observer_list_;
|
| + base::ObserverList<ui::ContextFactoryObserver> observer_list_;
|
| std::unique_ptr<cc::SurfaceManager> surface_manager_;
|
| uint32_t next_surface_id_namespace_;
|
| std::unique_ptr<cc::SingleThreadTaskGraphRunner> task_graph_runner_;
|
|
|