Index: blimp/client/support/compositor/compositor_dependencies_impl.cc |
diff --git a/blimp/client/support/compositor/compositor_dependencies_impl.cc b/blimp/client/support/compositor/compositor_dependencies_impl.cc |
index 56ebf21a719a0a50be423d0fe3a3b8655f7744ee..a62b9c39a937219675281f34bbae0d06c0c2c9b0 100644 |
--- a/blimp/client/support/compositor/compositor_dependencies_impl.cc |
+++ b/blimp/client/support/compositor/compositor_dependencies_impl.cc |
@@ -91,15 +91,20 @@ cc::SurfaceManager* CompositorDependenciesImpl::GetSurfaceManager() { |
return surface_manager_.get(); |
} |
-uint32_t CompositorDependenciesImpl::AllocateSurfaceId() { |
+uint32_t CompositorDependenciesImpl::AllocateSurfaceClientId() { |
return ++next_surface_id_; |
} |
-void CompositorDependenciesImpl::GetContextProvider( |
+void CompositorDependenciesImpl::GetContextProviders( |
const CompositorDependencies::ContextProviderCallback& callback) { |
- scoped_refptr<cc::ContextProvider> provider = BlimpContextProvider::Create( |
- gfx::kNullAcceleratedWidget, gpu_memory_buffer_manager_.get()); |
- callback.Run(provider); |
+ scoped_refptr<cc::ContextProvider> compositor_context = |
+ BlimpContextProvider::Create(gfx::kNullAcceleratedWidget, |
+ gpu_memory_buffer_manager_.get()); |
+ |
+ // TODO(khushalsagar): Make a worker context and bind to the current thread. |
+ ContextProviders context_providers; |
+ context_providers.compositor_context_provider = std::move(compositor_context); |
+ callback.Run(context_providers); |
} |
} // namespace client |