Index: ui/compositor/test/in_process_context_factory.cc |
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc |
index 3bf0d3ebf764648e733b667c61598d52b9afdd2b..042f9a320c6b5f379b47986d43f848a3e0004ae3 100644 |
--- a/ui/compositor/test/in_process_context_factory.cc |
+++ b/ui/compositor/test/in_process_context_factory.cc |
@@ -39,8 +39,8 @@ InProcessContextFactory::InProcessContextFactory() |
InProcessContextFactory::~InProcessContextFactory() {} |
-scoped_ptr<cc::OutputSurface> InProcessContextFactory::CreateOutputSurface( |
- Compositor* compositor, |
+void InProcessContextFactory::CreateOutputSurface( |
+ base::WeakPtr<Compositor> compositor, |
bool software_fallback) { |
DCHECK(!software_fallback); |
blink::WebGraphicsContext3D::Attributes attrs; |
@@ -60,7 +60,8 @@ scoped_ptr<cc::OutputSurface> InProcessContextFactory::CreateOutputSurface( |
scoped_refptr<ContextProviderInProcess> context_provider = |
ContextProviderInProcess::Create(context3d.Pass(), "UICompositor"); |
- return make_scoped_ptr(new cc::PixelTestOutputSurface(context_provider)); |
+ compositor->SetOutputSurface( |
+ make_scoped_ptr(new cc::PixelTestOutputSurface(context_provider))); |
} |
scoped_refptr<Reflector> InProcessContextFactory::CreateReflector( |