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 <limits>
 
 #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/public/common/content_switches.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/WebSize.h"
 #include "ui/gl/gl_switches.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(
-      new RenderWidgetCompositor(widget, client));
+  scoped_ptr<RenderWidgetCompositor> compositor(
+      new RenderWidgetCompositor(widget));
 
   CommandLine* cmd = CommandLine::ForCurrentProcess();
 
   cc::LayerTreeSettings settings;
   settings.acceleratePainting =
       cmd->HasSwitch(switches::kEnableAcceleratedPainting);
   settings.renderVSyncEnabled = !cmd->HasSwitch(switches::kDisableGpuVsync);
   settings.perTilePaintingEnabled =
       cmd->HasSwitch(cc::switches::kEnablePerTilePainting);
   settings.acceleratedAnimationEnabled =
@@ skipping 135 matching lines @@
 #if defined(OS_ANDROID)
   // TODO(danakj): Move these to the android code.
   settings.canUseLCDText = false;
   settings.maxPartialTextureUpdates = 0;
   settings.useLinearFadeScrollbarAnimator = true;
   settings.solidColorScrollbars = true;
   settings.solidColorScrollbarColor = SkColorSetARGB(128, 128, 128, 128);
   settings.solidColorScrollbarThicknessDIP = 3;
 #endif
 
-  if (!comp->initialize(settings))
+  if (!compositor->initialize(settings))
     return scoped_ptr<RenderWidgetCompositor>();
 
-  return comp.Pass();
+  return compositor.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",
         "RenderWidgetCompositor::SetSuppressScheduleComposite", this);
   else
     TRACE_EVENT_ASYNC_END0("gpu",
         "RenderWidgetCompositor::SetSuppressScheduleComposite", this);
   suppress_schedule_composite_ = suppress;
 }
 
+void RenderWidgetCompositor::Animate(base::TimeTicks time) {
+  layer_tree_host_->updateAnimations(time);
+}
+
+void RenderWidgetCompositor::Composite() {
+  layer_tree_host_->composite();
+}
+
+void RenderWidgetCompositor::GetRenderingStats(cc::RenderingStats* stats) {
+  layer_tree_host_->renderingStats(stats);
+}
+
+skia::RefPtr<SkPicture> RenderWidgetCompositor::CapturePicture() {
+  return layer_tree_host_->capturePicture();
+}
+
+void RenderWidgetCompositor::EnableHidingTopControls(bool enable) {
+  layer_tree_host_->enableHidingTopControls(enable);
+}
+
 bool RenderWidgetCompositor::initialize(cc::LayerTreeSettings settings) {
   scoped_ptr<cc::Thread> impl_thread;
   CompositorThread* compositor_thread =
       RenderThreadImpl::current()->compositor_thread();
   threaded_ = !!compositor_thread;
   if (compositor_thread)
     impl_thread = cc::ThreadImpl::createForDifferentThread(
         compositor_thread->message_loop()->message_loop_proxy());
   layer_tree_host_ = cc::LayerTreeHost::create(this,
                                                settings,
@@ skipping 81 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 34 matching lines @@
 }
 
 void RenderWidgetCompositor::didBeginFrame() {
   widget_->InstrumentDidBeginFrame();
 }
 
 void RenderWidgetCompositor::animate(double 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 19 matching lines @@
   return RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
 }
 
 scoped_refptr<cc::ContextProvider>
 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() {
   return RenderThreadImpl::current()->
       OffscreenContextProviderForCompositorThread();
 }
 
 }  // namespace content