Clean up RenderWidget/RenderWidgetCompositor/WebKit interactions

content/renderer/gpu/render_widget_compositor.h

Index: content/renderer/gpu/render_widget_compositor.h
diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h
index ccf84e3346995b93e12bfb1bb4d826b3d8ecdf1e..43f9fe355a053541b23647fe6965d8a72e62ff66 100644
--- a/content/renderer/gpu/render_widget_compositor.h
+++ b/content/renderer/gpu/render_widget_compositor.h
@@ -23,7 +23,6 @@ class RenderWidgetCompositor : public WebKit::WebLayerTreeView,
   // with the given settings. Returns NULL if initialization fails.
   static scoped_ptr<RenderWidgetCompositor> Create(
       RenderWidget* widget,
-      WebKit::WebLayerTreeViewClient* client,
       WebKit::WebLayerTreeView::Settings settings);
 
   virtual ~RenderWidgetCompositor();
@@ -58,8 +57,6 @@ class RenderWidgetCompositor : public WebKit::WebLayerTreeView,
   virtual void setNeedsAnimate();
   virtual void setNeedsRedraw();
   virtual bool commitRequested() const;
-  virtual void composite();
-  virtual void updateAnimations(double frame_begin_time);

[piman, 2013/03/01 01:51:40]

nit: We could keep both of these as accessor functions (i.e. non virtual), so
that RenderWidget doesn't have to reach into the layer_tree_host. It is kinda
awkward to have both the RWC reach into widget_->webwidget() and RW reach into
compositor_->layer_tree_host(), that makes both of them very strongly coupled.

   virtual void didStopFlinging();
   virtual bool compositeAndReadback(void *pixels, const WebKit::WebRect& rect);
   virtual void finishAllRendering();
@@ -91,15 +88,13 @@ class RenderWidgetCompositor : public WebKit::WebLayerTreeView,
       OffscreenContextProviderForCompositorThread() OVERRIDE;
 
 private:
-  RenderWidgetCompositor(RenderWidget* widget,
-                         WebKit::WebLayerTreeViewClient* client);
+  explicit RenderWidgetCompositor(RenderWidget* widget);
 
   bool initialize(cc::LayerTreeSettings settings);
 
   bool threaded_;
   bool suppress_schedule_composite_;
   RenderWidget* widget_;
-  WebKit::WebLayerTreeViewClient* client_;
   scoped_ptr<cc::LayerTreeHost> layer_tree_host_;
 
   class MainThreadContextProvider;