Introduce CompositorDependencies for RenderWidgetCompositor.

content/renderer/gpu/render_widget_compositor.h

 // Copyright (c) 2013 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 CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_
 #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "cc/base/swap_promise.h"
 #include "cc/base/swap_promise_monitor.h"
 #include "cc/input/top_controls_state.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_single_thread_client.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "content/common/content_export.h"
+#include "content/renderer/gpu/compositor_dependencies.h"
 #include "third_party/WebKit/public/platform/WebLayerTreeView.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/rect.h"
 
 namespace ui {
 struct LatencyInfo;
 }
 
 namespace cc {
 class CopyOutputRequest;
 class InputHandler;
 class Layer;
 class LayerTreeHost;
 }
 
 namespace content {
 class RenderWidget;
 
 class CONTENT_EXPORT RenderWidgetCompositor
     : NON_EXPORTED_BASE(public blink::WebLayerTreeView),
       NON_EXPORTED_BASE(public cc::LayerTreeHostClient),
       NON_EXPORTED_BASE(public cc::LayerTreeHostSingleThreadClient) {
  public:
   // Attempt to construct and initialize a compositor instance for the widget
   // with the given settings. Returns NULL if initialization fails.
-  static scoped_ptr<RenderWidgetCompositor> Create(RenderWidget* widget,
-                                                   bool threaded);
+  static scoped_ptr<RenderWidgetCompositor> Create(
+      RenderWidget* widget,
+      CompositorDependencies* compositor_deps);
 
   virtual ~RenderWidgetCompositor();
 
   const base::WeakPtr<cc::InputHandler>& GetInputHandler();
   bool BeginMainFrameRequested() const;
   void SetNeedsDisplayOnAllLayers();
   void SetRasterizeOnlyVisibleContent();
   void UpdateTopControlsState(cc::TopControlsState constraints,
                               cc::TopControlsState current,
                               bool animate);
@@ skipping 100 matching lines @@
   void ScheduleAnimation() override;
   void DidPostSwapBuffers() override;
   void DidAbortSwapBuffers() override;
 
   enum {
    OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK = 4,
    MAX_OUTPUT_SURFACE_RETRIES = 5,
   };
 
  protected:
-  RenderWidgetCompositor(RenderWidget* widget, bool threaded);
+  RenderWidgetCompositor(RenderWidget* widget,
+                         CompositorDependencies* compositor_deps);
 
-  void Initialize(const cc::LayerTreeSettings& settings);
+  void Initialize();
 
   cc::LayerTreeHost* layer_tree_host() { return layer_tree_host_.get(); }
 
  private:
   int num_failed_recreate_attempts_;
-  bool threaded_;
   RenderWidget* widget_;
+  CompositorDependencies* compositor_deps_;
   scoped_ptr<cc::LayerTreeHost> layer_tree_host_;
 
   scoped_ptr<cc::CopyOutputRequest> temporary_copy_output_request_;
 
   bool send_v8_idle_notification_after_commit_;
   base::TimeTicks begin_main_frame_time_;
   // The time interval between BeginMainFrame calls, provided by the scheduler.
   base::TimeDelta begin_main_frame_interval_;
 
   base::WeakPtrFactory<RenderWidgetCompositor> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_