Make RenderWidget responsible for the composited view's lifetime

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 8835d0f403cb9193bf2f24293549a07ea4f438f3..3581c06a090cf9fde7d8af43860e26a2ee921657 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -14,15 +14,17 @@
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.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"
 #include "ipc/ipc_sync_message.h"
 #include "skia/ext/platform_canvas.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSupport.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHelperPlugin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPagePopup.h"
@@ -202,10 +204,11 @@ void RenderWidget::CompleteInit() {
 
   init_complete_ = true;
 
-  if (webwidget_) {
-    webwidget_->setCompositorSurfaceReady();
-    if (is_threaded_compositing_enabled_)
-      webwidget_->enterForceCompositingMode(true);
+  if (webwidget_ && is_threaded_compositing_enabled_) {
+    webwidget_->enterForceCompositingMode(true);
+  }
+  if (web_layer_tree_view_) {
+    web_layer_tree_view_->setSurfaceReady();
   }
   DoDeferredUpdate();
 
@@ -602,10 +605,15 @@ void RenderWidget::OnHandleInputEvent(const WebKit::WebInputEvent* input_event,
       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_->commitRequested();
+  }
+
   bool is_input_throttled =
       throttle_input_events_ &&
-      ((webwidget_ ? webwidget_->isInputThrottled() : false) ||
-      paint_aggregator_.HasPendingUpdate());
+      frame_pending;
 
   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
@@ -843,7 +851,11 @@ void RenderWidget::AnimateIfNeeded() {
     animation_timer_.Start(FROM_HERE, animationInterval, this,
                            &RenderWidget::AnimationCallback);
     animation_update_pending_ = false;
-    webwidget_->animate(0.0);
+    if (is_accelerated_compositing_active_) {
+      web_layer_tree_view_->updateAnimations(0.0);

[enne (OOO), 2012/12/16 20:02:59]

Why is this zero? It seems like if you're hoisting this up into render widget
that you need to start passing a real time.

+    } else {
+      webwidget_->animate(0.0);
+    }
     return;
   }
   TRACE_EVENT0("renderer", "EarlyOut_AnimatedTooRecently");
@@ -1070,7 +1082,7 @@ void RenderWidget::DoDeferredUpdate() {
     // If it needs to (e.g. composited UI), the GPU process does its own ACK
     // with the browser for the GPU surface.
     pending_update_params_->needs_ack = false;
-    webwidget_->composite(false);
+    web_layer_tree_view_->composite();
   }
 
   // If we're holding a pending input event ACK, send the ACK before sending the
@@ -1234,9 +1246,23 @@ void RenderWidget::initializeLayerTreeView(
     WebKit::WebLayerTreeViewClient* client,
     const WebKit::WebLayer& root_layer,
     const WebKit::WebLayerTreeView::Settings& settings) {
-  web_layer_tree_view_.reset(
-      WebKit::Platform::current()->compositorSupport()->createLayerTreeView(
-          client, root_layer, 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() {
@@ -1609,7 +1635,7 @@ void RenderWidget::OnMsgRepaint(const gfx::Size& size_to_paint) {
 
   set_next_paint_is_repaint_ack();
   if (is_accelerated_compositing_active_) {
-    webwidget_->setNeedsRedraw();
+    web_layer_tree_view_->setNeedsRedraw();
     scheduleComposite();
   } else {
     gfx::Rect repaint_rect(size_to_paint.width(), size_to_paint.height());
@@ -1930,7 +1956,8 @@ void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) {
 
 void RenderWidget::GetRenderingStats(
     WebKit::WebRenderingStatsImpl& stats) const {
-  webwidget()->renderingStats(stats);
+  if (web_layer_tree_view_)
+    web_layer_tree_view_->renderingStats(stats);
 
   stats.rendering_stats.numAnimationFrames +=
       software_stats_.numAnimationFrames;