Clean up RenderWidget/RenderWidgetCompositor/WebKit interactions

content/renderer/render_widget.cc

Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index bf103346ef73cd78e6407492a9220ba5c7ee974b..1baaee8f5c0649ebecdc6c472337b82bf34f91d6 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -927,7 +927,9 @@ void RenderWidget::AnimateIfNeeded() {
       compositor_->layer_tree_host()->updateAnimations(
           base::TimeTicks::Now());
     } else {
-      webwidget_->animate(0.0);
+      double frame_begin_time =
+        (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF();
+      webwidget_->animate(frame_begin_time);
     }
     return;
   }
@@ -1200,7 +1202,7 @@ void RenderWidget::DoDeferredUpdate() {
 void RenderWidget::Composite() {
   DCHECK(is_accelerated_compositing_active_);
   if (compositor_)  // TODO(jamesr): Figure out how this can be null.
-    compositor_->composite();
+    compositor_->layer_tree_host()->composite();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1341,7 +1343,7 @@ void RenderWidget::initializeLayerTreeView(
     WebKit::WebLayerTreeViewClient* client,
     const WebKit::WebLayer& root_layer,
     const WebKit::WebLayerTreeView::Settings& settings) {
-  compositor_ = RenderWidgetCompositor::Create(this, client, settings);
+  compositor_ = RenderWidgetCompositor::Create(this, settings);
   if (!compositor_)
     return;