Revert 175303

content/renderer/render_widget.cc

Index: content/renderer/render_widget.cc
===================================================================
--- content/renderer/render_widget.cc	(revision 175303)
+++ content/renderer/render_widget.cc	(working copy)
@@ -14,13 +14,9 @@
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "cc/layer_tree_host.h"
-#include "cc/thread.h"
-#include "cc/thread_impl.h"
 #include "content/common/swapped_out_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
-#include "content/renderer/gpu/compositor_thread.h"
 #include "content/renderer/render_process.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
@@ -205,12 +201,11 @@
 
   init_complete_ = true;
 
-  if (webwidget_ && is_threaded_compositing_enabled_) {
-    webwidget_->enterForceCompositingMode(true);
+  if (webwidget_) {
+    webwidget_->setCompositorSurfaceReady();
+    if (is_threaded_compositing_enabled_)
+      webwidget_->enterForceCompositingMode(true);
   }
-  if (web_layer_tree_view_) {
-    web_layer_tree_view_->setSurfaceReady();
-  }
   DoDeferredUpdate();
 
   Send(new ViewHostMsg_RenderViewReady(routing_id_));
@@ -605,16 +600,10 @@
       input_event->type == WebInputEvent::MouseMove ||
       input_event->type == WebInputEvent::MouseWheel ||
       WebInputEvent::isTouchEventType(input_event->type);
-
-  bool frame_pending = paint_aggregator_.HasPendingUpdate();
-  if (is_accelerated_compositing_active_) {
-    frame_pending = web_layer_tree_view_ &&
-                    web_layer_tree_view_->commitRequested();
-  }
-
   bool is_input_throttled =
       throttle_input_events_ &&
-      frame_pending;
+      ((webwidget_ ? webwidget_->isInputThrottled() : false) ||
+      paint_aggregator_.HasPendingUpdate());
 
   if (event_type_gets_rate_limited && is_input_throttled && !is_hidden_) {
     // We want to rate limit the input events in this case, so we'll wait for
@@ -852,12 +841,7 @@
     animation_timer_.Start(FROM_HERE, animationInterval, this,
                            &RenderWidget::AnimationCallback);
     animation_update_pending_ = false;
-    if (is_accelerated_compositing_active_ && web_layer_tree_view_) {
-      web_layer_tree_view_->layer_tree_host()->updateAnimations(
-          base::TimeTicks::Now());
-    } else {
-      webwidget_->animate(0.0);
-    }
+    webwidget_->animate(0.0);
     return;
   }
   TRACE_EVENT0("renderer", "EarlyOut_AnimatedTooRecently");
@@ -1244,33 +1228,6 @@
     webwidget_->enterForceCompositingMode(false);
 }
 
-void RenderWidget::initializeLayerTreeView(
-    WebKit::WebLayerTreeViewClient* client,
-    const WebKit::WebLayer& root_layer,
-    const WebKit::WebLayerTreeView::Settings& settings) {
-  DCHECK(!web_layer_tree_view_);
-  web_layer_tree_view_.reset(new WebKit::WebLayerTreeViewImpl(client));
-
-  scoped_ptr<cc::Thread> impl_thread;
-  CompositorThread* compositor_thread =
-      RenderThreadImpl::current()->compositor_thread();
-  if (compositor_thread)
-    impl_thread = cc::ThreadImpl::createForDifferentThread(
-        compositor_thread->message_loop()->message_loop_proxy());
-  if (!web_layer_tree_view_->initialize(settings, impl_thread.Pass())) {
-    web_layer_tree_view_.reset();
-    return;
-  }
-  web_layer_tree_view_->setRootLayer(root_layer);
-  if (init_complete_) {
-    web_layer_tree_view_->setSurfaceReady();
-  }
-}
-
-WebKit::WebLayerTreeView* RenderWidget::layerTreeView() {
-  return web_layer_tree_view_.get();
-}
-
 void RenderWidget::willBeginCompositorFrame() {
   TRACE_EVENT0("gpu", "RenderWidget::willBeginCompositorFrame");
 
@@ -1422,7 +1379,6 @@
 
 void RenderWidget::Close() {
   if (webwidget_) {
-    web_layer_tree_view_.reset();
     webwidget_->close();
     webwidget_ = NULL;
   }
@@ -1636,9 +1592,8 @@
     return;
 
   set_next_paint_is_repaint_ack();
-  if (is_accelerated_compositing_active_/* && web_layer_tree_view_*/) {
-    if (web_layer_tree_view_)
-      web_layer_tree_view_->setNeedsRedraw();
+  if (is_accelerated_compositing_active_) {
+    webwidget_->setNeedsRedraw();
     scheduleComposite();
   } else {
     gfx::Rect repaint_rect(size_to_paint.width(), size_to_paint.height());
@@ -1972,8 +1927,7 @@
 
 void RenderWidget::GetRenderingStats(
     WebKit::WebRenderingStatsImpl& stats) const {
-  if (web_layer_tree_view_)
-    web_layer_tree_view_->renderingStats(stats);
+  webwidget()->renderingStats(stats);
 
   stats.rendering_stats.numAnimationFrames +=
       software_stats_.numAnimationFrames;