Clean up RenderWidget/RenderWidgetCompositor/WebKit interactions

content/renderer/gpu/render_widget_compositor.cc

 // 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.
 
 #include "content/renderer/gpu/render_widget_compositor.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "cc/context_provider.h"
 #include "cc/layer.h"
 #include "cc/layer_tree_debug_state.h"
 #include "cc/layer_tree_host.h"
 #include "cc/switches.h"
 #include "cc/thread_impl.h"
 #include "content/renderer/gpu/compositor_thread.h"
 #include "content/renderer/render_thread_impl.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSharedGraphicsContext3D.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "webkit/compositor_bindings/web_layer_impl.h"
 #include "webkit/compositor_bindings/web_to_ccinput_handler_adapter.h"
 
 namespace cc {
 class Layer;
 }
 
 using WebKit::WebFloatPoint;
@@ skipping 40 matching lines @@
     return false;
   }
 }
 
 
 }  // namespace
 
 // static
 scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
       RenderWidget* widget,
-      WebKit::WebLayerTreeViewClient* client,
       WebKit::WebLayerTreeView::Settings web_settings) {
   scoped_ptr<RenderWidgetCompositor> comp(

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

nit: s/comp/compositor/ while you're here?

-      new RenderWidgetCompositor(widget, client));
+      new RenderWidgetCompositor(widget));
 
   CommandLine* cmd = CommandLine::ForCurrentProcess();
 
   cc::LayerTreeSettings settings;
   settings.acceleratePainting = web_settings.acceleratePainting;
   settings.renderVSyncEnabled = web_settings.renderVSyncEnabled;
   settings.perTilePaintingEnabled = web_settings.perTilePaintingEnabled;
   settings.acceleratedAnimationEnabled =
       web_settings.acceleratedAnimationEnabled;
   settings.refreshRate = web_settings.refreshRate;
@@ skipping 110 matching lines @@
   settings.solidColorScrollbarColor = SkColorSetARGB(128, 128, 128, 128);
   settings.solidColorScrollbarThicknessDIP = 3;
 #endif
 
   if (!comp->initialize(settings))
     return scoped_ptr<RenderWidgetCompositor>();
 
   return comp.Pass();
 }
 
-RenderWidgetCompositor::RenderWidgetCompositor(
-    RenderWidget* widget, WebKit::WebLayerTreeViewClient* client)
+RenderWidgetCompositor::RenderWidgetCompositor(RenderWidget* widget)
   : suppress_schedule_composite_(false),
-    widget_(widget),
-    client_(client) {
+    widget_(widget) {
 }
 
 RenderWidgetCompositor::~RenderWidgetCompositor() {}
 
 void RenderWidgetCompositor::SetSuppressScheduleComposite(bool suppress) {
   if (suppress_schedule_composite_ == suppress)
     return;
 
   if (suppress)
     TRACE_EVENT_ASYNC_BEGIN0("gpu",
@@ skipping 98 matching lines @@
   if (threaded_)
     layer_tree_host_->setNeedsAnimate();
   else
     widget_->scheduleAnimation();
 }
 
 bool RenderWidgetCompositor::commitRequested() const {
   return layer_tree_host_->commitRequested();
 }
 
-void RenderWidgetCompositor::composite() {
-  layer_tree_host_->composite();
-}
-
-void RenderWidgetCompositor::updateAnimations(double frame_begin_time_sec) {
-  base::TimeTicks frame_begin_time =
-    base::TimeTicks::FromInternalValue(frame_begin_time_sec *
-                                       base::Time::kMicrosecondsPerSecond);
-  layer_tree_host_->updateAnimations(frame_begin_time);
-}
-
 void RenderWidgetCompositor::didStopFlinging() {
   layer_tree_host_->didStopFlinging();
 }
 
 bool RenderWidgetCompositor::compositeAndReadback(void *pixels,
                                                   const WebRect& rect) {
   return layer_tree_host_->compositeAndReadback(pixels, rect);
 }
 
 void RenderWidgetCompositor::finishAllRendering() {
@@ skipping 30 matching lines @@
 
 void RenderWidgetCompositor::willBeginFrame() {
   widget_->InstrumentWillBeginFrame();
   widget_->willBeginCompositorFrame();
 }
 
 void RenderWidgetCompositor::didBeginFrame() {
   widget_->InstrumentDidBeginFrame();
 }
 
-// TODO(jamesr): This should go through WebWidget
 void RenderWidgetCompositor::animate(double monotonic_frame_begin_time) {
-  client_->updateAnimations(monotonic_frame_begin_time);
+  widget_->webwidget()->animate(monotonic_frame_begin_time);
 }
 
-// Can delete from WebLayerTreeViewClient
-void RenderWidgetCompositor::layout() {
-  widget_->webwidget()->layout();
-}
-
-// TODO(jamesr): This should go through WebWidget
 void RenderWidgetCompositor::applyScrollAndScale(gfx::Vector2d scroll_delta,
                                                  float page_scale) {
-  client_->applyScrollAndScale(scroll_delta, page_scale);
+  widget_->webwidget()->applyScrollAndScale(scroll_delta, page_scale);
 }
 
 scoped_ptr<cc::OutputSurface> RenderWidgetCompositor::createOutputSurface() {
   return widget_->CreateOutputSurface();
 }
 
-// TODO(jamesr): This should go through WebWidget
 void RenderWidgetCompositor::didRecreateOutputSurface(bool success) {
-  client_->didRecreateOutputSurface(success);
+  if (!success)
+    widget_->webwidget()->didExitCompositingMode();
 }
 
-// TODO(jamesr): This should go through WebWidget
 scoped_ptr<cc::InputHandler> RenderWidgetCompositor::createInputHandler() {
   scoped_ptr<cc::InputHandler> ret;
   scoped_ptr<WebKit::WebInputHandler> web_handler(
-      client_->createInputHandler());
+      widget_->webwidget()->createInputHandler());
   if (web_handler)
      ret = WebKit::WebToCCInputHandlerAdapter::create(web_handler.Pass());
   return ret.Pass();
 }
 
 void RenderWidgetCompositor::willCommit() {
   widget_->InstrumentWillComposite();
 }
 
 void RenderWidgetCompositor::didCommit() {
@@ skipping 86 matching lines @@
 
 scoped_refptr<cc::ContextProvider>
 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() {
   if (!contexts_compositor_thread_ ||
       contexts_compositor_thread_->DestroyedOnMainThread())
     contexts_compositor_thread_ = new CompositorThreadContextProvider;
   return contexts_compositor_thread_;
 }
 
 }  // namespace content