| Index: content/browser/compositor/test/no_transport_image_transport_factory.h
|
| diff --git a/content/browser/compositor/test/no_transport_image_transport_factory.h b/content/browser/compositor/test/no_transport_image_transport_factory.h
|
| index 6bcca6fd25a9907eca58ea0182cae97e10dcd2b3..67ba4ecd4dc43fe1199c6787ebf90bc2a037cb53 100644
|
| --- a/content/browser/compositor/test/no_transport_image_transport_factory.h
|
| +++ b/content/browser/compositor/test/no_transport_image_transport_factory.h
|
| @@ -24,8 +24,6 @@ class NoTransportImageTransportFactory : public ImageTransportFactory {
|
| // ImageTransportFactory implementation.
|
| virtual ui::ContextFactory* GetContextFactory() override;
|
| virtual gfx::GLSurfaceHandle GetSharedSurfaceHandle() override;
|
| - virtual scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator()
|
| - override;
|
| virtual cc::SurfaceManager* GetSurfaceManager() override;
|
| virtual GLHelper* GetGLHelper() override;
|
| virtual void AddObserver(ImageTransportFactoryObserver* observer) override;
|
| @@ -38,6 +36,7 @@ class NoTransportImageTransportFactory : public ImageTransportFactory {
|
| scoped_ptr<ui::ContextFactory> context_factory_;
|
| scoped_refptr<cc::ContextProvider> context_provider_;
|
| scoped_ptr<GLHelper> gl_helper_;
|
| + scoped_ptr<cc::SurfaceManager> surface_manager_;
|
| ObserverList<ImageTransportFactoryObserver> observer_list_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NoTransportImageTransportFactory);
|
|
|