| Index: content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| diff --git a/content/browser/compositor/test/no_transport_image_transport_factory.cc b/content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| index 524223f819186d8a69cd73e724d826b6734a14e2..808d297f6db20029748596afac0501ae40e03500 100644
|
| --- a/content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| +++ b/content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| @@ -5,6 +5,7 @@
|
| #include "content/browser/compositor/test/no_transport_image_transport_factory.h"
|
|
|
| #include "cc/output/context_provider.h"
|
| +#include "cc/surfaces/surface_manager.h"
|
| #include "content/common/gpu/client/gl_helper.h"
|
| #include "gpu/command_buffer/client/gles2_interface.h"
|
| #include "ui/compositor/compositor.h"
|
| @@ -13,7 +14,8 @@
|
| namespace content {
|
|
|
| NoTransportImageTransportFactory::NoTransportImageTransportFactory()
|
| - : context_factory_(new ui::InProcessContextFactory) {
|
| + : context_factory_(new ui::InProcessContextFactory),
|
| + surface_manager_(new cc::SurfaceManager) {
|
| }
|
|
|
| NoTransportImageTransportFactory::~NoTransportImageTransportFactory() {
|
| @@ -31,13 +33,8 @@ NoTransportImageTransportFactory::GetSharedSurfaceHandle() {
|
| return gfx::GLSurfaceHandle();
|
| }
|
|
|
| -scoped_ptr<cc::SurfaceIdAllocator>
|
| -NoTransportImageTransportFactory::CreateSurfaceIdAllocator() {
|
| - return scoped_ptr<cc::SurfaceIdAllocator>();
|
| -}
|
| -
|
| cc::SurfaceManager* NoTransportImageTransportFactory::GetSurfaceManager() {
|
| - return NULL;
|
| + return surface_manager_.get();
|
| }
|
|
|
| GLHelper* NoTransportImageTransportFactory::GetGLHelper() {
|
|
|