| 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 1ee7de51036c7a31c35fd235ffc924d5de793387..5c613dac1df6143f9ff302efe85b6c7df0a38d7b 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);
|
|
|