Use different client interface for WebLayerTreeViewForTesting to decouple from WebLayerTreeViewClie…

webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc

 // Copyright 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 "webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/synchronization/lock.h"
 #include "cc/context_provider.h"
@@ skipping 15 matching lines @@
 #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_compositor_support_impl.h"
 #include "webkit/compositor_bindings/web_compositor_support_software_output_device.h"
 #include "webkit/compositor_bindings/web_layer_impl.h"
 #include "webkit/compositor_bindings/web_rendering_stats_impl.h"
 #include "webkit/compositor_bindings/web_to_ccinput_handler_adapter.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 namespace WebKit {
+WebLayerTreeViewImplForTesting::WebLayerTreeViewImplForTesting(
+    RenderingType type,
+    webkit_support::DRTLayerTreeViewClient* client)
+    : type_(type),
+      drt_client_(client),
+      client_(NULL) {}
 
 WebLayerTreeViewImplForTesting::WebLayerTreeViewImplForTesting(
     RenderingType type,
     WebKit::WebLayerTreeViewClient* client)
-    : type_(type), client_(client) {}
+    : type_(type),
+      drt_client_(NULL),
+      client_(client) {}
 
 WebLayerTreeViewImplForTesting::~WebLayerTreeViewImplForTesting() {}
 
 bool WebLayerTreeViewImplForTesting::initialize(
     scoped_ptr<cc::Thread> compositor_thread) {
   cc::LayerTreeSettings settings;
   // Accelerated animations are disabled for layout tests, but enabled for unit
   // tests.
   settings.acceleratedAnimationEnabled = type_ == FAKE_CONTEXT;
   layer_tree_host_ =
@@ skipping 105 matching lines @@
 }
 
 void WebLayerTreeViewImplForTesting::renderingStats(WebRenderingStats&) const {}
 
 void WebLayerTreeViewImplForTesting::willBeginFrame() {}
 
 void WebLayerTreeViewImplForTesting::didBeginFrame() {}
 
 void WebLayerTreeViewImplForTesting::animate(
     double monotonic_frame_begin_time) {
-  if (client_)
-    client_->updateAnimations(monotonic_frame_begin_time);
 }
 
 void WebLayerTreeViewImplForTesting::layout() {
+  if (drt_client_)
+    drt_client_->Layout();
   if (client_)
     client_->layout();
 }
 
 void WebLayerTreeViewImplForTesting::applyScrollAndScale(
     gfx::Vector2d scroll_delta,
     float page_scale) {}
 
 scoped_ptr<cc::OutputSurface>
 WebLayerTreeViewImplForTesting::createOutputSurface() {
@@ skipping 33 matching lines @@
 
 void WebLayerTreeViewImplForTesting::willCommit() {}
 
 void WebLayerTreeViewImplForTesting::didCommit() {}
 
 void WebLayerTreeViewImplForTesting::didCommitAndDrawFrame() {}
 
 void WebLayerTreeViewImplForTesting::didCompleteSwapBuffers() {}
 
 void WebLayerTreeViewImplForTesting::scheduleComposite() {
+  if (drt_client_)
+    drt_client_->ScheduleComposite();
   if (client_)
     client_->scheduleComposite();
 }
 
 class WebLayerTreeViewImplForTesting::MainThreadContextProvider :
     public cc::ContextProvider {
  public:
   virtual bool InitializeOnMainThread() OVERRIDE { return true; }
   virtual bool BindToCurrentThread() OVERRIDE { return true; }
 
@@ skipping 58 matching lines @@
 
 scoped_refptr<cc::ContextProvider>
 WebLayerTreeViewImplForTesting::OffscreenContextProviderForCompositorThread() {
   if (!contexts_compositor_thread_ ||
       contexts_compositor_thread_->DestroyedOnMainThread())
     contexts_compositor_thread_ = new CompositorThreadContextProvider;
   return contexts_compositor_thread_;
 }
 
 }  // namespace WebKit