Expose Blimp dependencies to the embedder

blimp/client/app/compositor/browser_compositor.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BLIMP_CLIENT_APP_COMPOSITOR_BROWSER_COMPOSITOR_H_
 #define BLIMP_CLIENT_APP_COMPOSITOR_BROWSER_COMPOSITOR_H_
 
 #include "base/macros.h"
 #include "base/callback.h"
+#include "base/memory/weak_ptr.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_single_thread_client.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace cc {
 class Display;
 class Layer;
 class LayerTreeHost;
 class SurfaceIdAllocator;
 class SurfaceManager;
 }  // namespace cc
 
 namespace blimp {
 namespace client {
-class BlimpGpuMemoryBufferManager;
+class CompositorDependencies;
 
 // The parent compositor that embeds the content from the BlimpCompositor for
 // the current page.
 class BrowserCompositor : public cc::LayerTreeHostClient,
                           public cc::LayerTreeHostSingleThreadClient {
  public:
-  // TODO(dtrainor): Move these to the CompositorDeps and share them with the
-  // BlimpCompositor.
-  static cc::SurfaceManager* GetSurfaceManager();
-  static BlimpGpuMemoryBufferManager* GetGpuMemoryBufferManager();
-  static uint32_t AllocateSurfaceClientId();
-
-  BrowserCompositor();
+  explicit BrowserCompositor(CompositorDependencies* compositor_dependencies);
   ~BrowserCompositor() override;
 
   // Sets the layer with the content from the renderer compositor.
   void SetContentLayer(scoped_refptr<cc::Layer> content_layer);
 
   // Sets the size for the display. Should be in physical pixels.
   void SetSize(const gfx::Size& size_in_px);
 
   // Sets the widget that the |cc::Display| draws to. On proving it the widget,
   // the compositor will become visible and start drawing to the widget. When
   // the widget goes away, we become invisible and drop all resources being
   // used to draw to the screen.
   void SetAcceleratedWidget(gfx::AcceleratedWidget widget);
 
+  // Called when the a ContextProvider has been created by the
+  // CompositorDependencies class.  If |host_| is waiting on an OutputSurface
+  // this will build one for it.
+  void OnContextProviderCreated(scoped_refptr<cc::ContextProvider> provider);
+
   // A callback to get notifed when the compositor performs a successful swap.
   void set_did_complete_swap_buffers_callback(base::Closure callback) {
     did_complete_swap_buffers_ = callback;
   }
 
  private:
   // LayerTreeHostClient implementation.
   void WillBeginMainFrame() override {}
   void DidBeginMainFrame() override {}
   void BeginMainFrame(const cc::BeginFrameArgs& args) override {}
@@ skipping 10 matching lines @@
   void WillCommit() override {}
   void DidCommit() override {}
   void DidCommitAndDrawFrame() override {}
   void DidCompleteSwapBuffers() override;
   void DidCompletePageScaleAnimation() override {}
 
   // LayerTreeHostSingleThreadClient implementation.
   void DidPostSwapBuffers() override {}
   void DidAbortSwapBuffers() override {}
 
-  void HandlePendingOutputSurfaceRequest();
+  CompositorDependencies* compositor_dependencies_;
 
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
   gfx::AcceleratedWidget widget_;
   bool output_surface_request_pending_;
   std::unique_ptr<cc::Display> display_;
 
   gfx::Size viewport_size_in_px_;
 
   std::unique_ptr<cc::LayerTreeHost> host_;
   scoped_refptr<cc::Layer> root_layer_;
 
   base::Closure did_complete_swap_buffers_;
 
+  base::WeakPtrFactory<BrowserCompositor> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserCompositor);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_APP_COMPOSITOR_BROWSER_COMPOSITOR_H_