Index: blimp/client/feature/compositor/blimp_compositor.h |
diff --git a/blimp/client/feature/compositor/blimp_compositor.h b/blimp/client/feature/compositor/blimp_compositor.h |
index ab5546c4570ca49f86279c73db67b98e846e24f9..2d8cadb451a87e2fbd70955b7edbbc84f6614643 100644 |
--- a/blimp/client/feature/compositor/blimp_compositor.h |
+++ b/blimp/client/feature/compositor/blimp_compositor.h |
@@ -11,6 +11,7 @@ |
#include "base/memory/ref_counted.h" |
#include "blimp/client/core/compositor/blimp_output_surface.h" |
#include "blimp/client/feature/compositor/blimp_input_manager.h" |
+#include "blimp/client/public/compositor/compositor_dependencies.h" |
#include "cc/surfaces/surface_factory_client.h" |
#include "cc/trees/layer_tree_host.h" |
#include "cc/trees/layer_tree_host_client.h" |
@@ -46,7 +47,6 @@ class BlimpMessage; |
namespace client { |
class BlimpCompositorDependencies; |
-class CompositorDependencies; |
// The BlimpCompositorClient provides the BlimpCompositor with the necessary |
// dependencies for cc::LayerTreeHost owned by this compositor and for |
@@ -107,7 +107,8 @@ class BlimpCompositor : public cc::LayerTreeHostClient, |
// CompositorDependencies class. If |host_| is waiting on an OutputSurface |
// this will build one for it. |
void OnContextProviderCreated( |
David Trainor- moved to gerrit
2016/08/31 00:28:58
Provider -> Providers?
Khushal
2016/08/31 21:22:50
Done.
|
- const scoped_refptr<cc::ContextProvider>& provider); |
+ const blimp::client::CompositorDependencies::ContextProviders& |
+ context_providers); |
scoped_refptr<cc::Layer> layer() const { return layer_; } |