| Index: blimp/client/public/compositor/compositor_dependencies.h
|
| diff --git a/blimp/client/public/compositor/compositor_dependencies.h b/blimp/client/public/compositor/compositor_dependencies.h
|
| index 954ac9fbcf12ad4dc0ad45edddf567df635baf6e..117169fd4b1446e9beb1933355e839fb970131c6 100644
|
| --- a/blimp/client/public/compositor/compositor_dependencies.h
|
| +++ b/blimp/client/public/compositor/compositor_dependencies.h
|
| @@ -10,7 +10,6 @@
|
|
|
| namespace cc {
|
| class ContextProvider;
|
| -class LayerTreeSettings;
|
| class SurfaceManager;
|
| } // namespace cc
|
|
|
| @@ -25,20 +24,26 @@ namespace client {
|
| // is expected to outlive all BlimpContents instances.
|
| class CompositorDependencies {
|
| public:
|
| - using ContextProviderCallback =
|
| - base::Callback<void(const scoped_refptr<cc::ContextProvider>&)>;
|
| + struct ContextProviders {
|
| + ContextProviders();
|
| + ~ContextProviders();
|
| +
|
| + scoped_refptr<cc::ContextProvider> compositor_context_provider;
|
| + scoped_refptr<cc::ContextProvider> worker_context_provider;
|
| + };
|
| +
|
| + using ContextProviderCallback = base::Callback<void(const ContextProviders&)>;
|
|
|
| virtual ~CompositorDependencies() = default;
|
|
|
| // Settings used to create all BlimpCompositor instances.
|
| - virtual cc::LayerTreeSettings* GetLayerTreeSettings() = 0;
|
| virtual gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() = 0;
|
| virtual cc::SurfaceManager* GetSurfaceManager() = 0;
|
| - virtual uint32_t AllocateSurfaceId() = 0;
|
| + virtual uint32_t AllocateSurfaceClientId() = 0;
|
|
|
| // This call may return synchronously if the ContextProvider has already been
|
| // created.
|
| - virtual void GetContextProvider(const ContextProviderCallback& callback) = 0;
|
| + virtual void GetContextProviders(const ContextProviderCallback& callback) = 0;
|
| };
|
|
|
| } // namespace client
|
|
|