Move compositor thread input handling logic into content

cc/trees/thread_proxy.cc

 // Copyright 2011 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 "cc/trees/thread_proxy.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "cc/base/thread.h"
@@ skipping 500 matching lines @@
 
 void ThreadProxy::MainThreadHasStoppedFlinging() {
   DCHECK(IsMainThread());
   Proxy::ImplThread()->PostTask(
       base::Bind(&ThreadProxy::MainThreadHasStoppedFlingingOnImplThread,
                  impl_thread_weak_ptr_));
 }
 
 void ThreadProxy::MainThreadHasStoppedFlingingOnImplThread() {
   DCHECK(IsImplThread());
-  if (input_handler_client_on_impl_thread_)
-    input_handler_client_on_impl_thread_->MainThreadHasStoppedFlinging();
+  layer_tree_host_impl_->MainThreadHasStoppedFlinging();
 }
 
 void ThreadProxy::Start() {
   DCHECK(IsMainThread());
   DCHECK(Proxy::ImplThread());
   // Create LayerTreeHostImpl.
   DebugScopedSetMainThreadBlocked main_thread_blocked(this);
   CompletionEvent completion;
-  scoped_ptr<InputHandlerClient> input_handler_client =
-      layer_tree_host_->CreateInputHandlerClient();
   Proxy::ImplThread()->PostTask(
       base::Bind(&ThreadProxy::InitializeImplOnImplThread,
                  base::Unretained(this),
-                 &completion,
-                 input_handler_client.release()));
+                 &completion));
   completion.Wait();
 
   main_thread_weak_ptr_ = weak_factory_.GetWeakPtr();
 
   started_ = true;
 }
 
 void ThreadProxy::Stop() {
   TRACE_EVENT0("cc", "ThreadProxy::Stop");
   DCHECK(IsMainThread());
@@ skipping 327 matching lines @@
   result.did_swap = false;
   DCHECK(IsImplThread());
   DCHECK(layer_tree_host_impl_.get());
   if (!layer_tree_host_impl_)
     return result;
 
   DCHECK(layer_tree_host_impl_->renderer());
   if (!layer_tree_host_impl_->renderer())
     return result;
 
   base::TimeTicks monotonic_time =

[danakj, 2013/05/01 19:20:43]

nit: These temp vars could go away and just call CurrentFrame* when calling
Animate(), same as OnTimerTick() in LTHI.cc

       layer_tree_host_impl_->CurrentFrameTimeTicks();
   base::Time wall_clock_time = layer_tree_host_impl_->CurrentFrameTime();
 
-  if (input_handler_client_on_impl_thread_)
-    input_handler_client_on_impl_thread_->Animate(monotonic_time);
-
   layer_tree_host_impl_->ActivatePendingTreeIfNeeded();
   layer_tree_host_impl_->Animate(monotonic_time, wall_clock_time);
   layer_tree_host_impl_->UpdateBackgroundAnimateTicking(false);
 
   // This method is called on a forced draw, regardless of whether we are able
   // to produce a frame, as the calling site on main thread is blocked until its
   // request completes, and we signal completion here. If CanDraw() is false, we
   // will indicate success=false to the caller, but we must still signal
   // completion to avoid deadlock.
 
@@ skipping 171 matching lines @@
   DCHECK(layer_tree_host_);
   LayerTreeHost::RecreateResult result =
       layer_tree_host_->RecreateOutputSurface();
   if (result == LayerTreeHost::RecreateFailedButTryAgain)
     Proxy::MainThread()->PostTask(
         output_surface_recreation_callback_.callback());
   else if (result == LayerTreeHost::RecreateSucceeded)
     output_surface_recreation_callback_.Cancel();
 }
 
-void ThreadProxy::InitializeImplOnImplThread(
-    CompletionEvent* completion,
-    InputHandlerClient* input_handler_client) {
+void ThreadProxy::InitializeImplOnImplThread(CompletionEvent* completion) {
   TRACE_EVENT0("cc", "ThreadProxy::InitializeImplOnImplThread");
   DCHECK(IsImplThread());
   layer_tree_host_impl_ = layer_tree_host_->CreateLayerTreeHostImpl(this);
   const base::TimeDelta display_refresh_interval =
       base::TimeDelta::FromMicroseconds(
           base::Time::kMicrosecondsPerSecond /
           layer_tree_host_->settings().refresh_rate);
   scoped_ptr<FrameRateController> frame_rate_controller;
   if (render_vsync_enabled_) {
     if (render_vsync_notification_enabled_) {
@@ skipping 10 matching lines @@
   const LayerTreeSettings& settings = layer_tree_host_->settings();
   SchedulerSettings scheduler_settings;
   scheduler_settings.impl_side_painting = settings.impl_side_painting;
   scheduler_settings.timeout_and_draw_when_animation_checkerboards =
       settings.timeout_and_draw_when_animation_checkerboards;
   scheduler_on_impl_thread_ = Scheduler::Create(this,
                                                 frame_rate_controller.Pass(),
                                                 scheduler_settings);
   scheduler_on_impl_thread_->SetVisible(layer_tree_host_impl_->visible());
 
-  input_handler_client_on_impl_thread_.reset(input_handler_client);
-  if (input_handler_client_on_impl_thread_) {
-    input_handler_client_on_impl_thread_->BindToHandler(
-        layer_tree_host_impl_.get());
-  }
-
   impl_thread_weak_ptr_ = weak_factory_on_impl_thread_.GetWeakPtr();
   completion->Signal();
 }
 
 void ThreadProxy::InitializeOutputSurfaceOnImplThread(
     scoped_ptr<OutputSurface> output_surface) {
   TRACE_EVENT0("cc", "ThreadProxy::InitializeContextOnImplThread");
   DCHECK(IsImplThread());
   output_surface_before_initialization_on_impl_thread_ = output_surface.Pass();
 }
@@ skipping 24 matching lines @@
 
   completion->Signal();
 }
 
 void ThreadProxy::LayerTreeHostClosedOnImplThread(CompletionEvent* completion) {
   TRACE_EVENT0("cc", "ThreadProxy::LayerTreeHostClosedOnImplThread");
   DCHECK(IsImplThread());
   layer_tree_host_->DeleteContentsTexturesOnImplThread(
       layer_tree_host_impl_->resource_provider());
   layer_tree_host_impl_->EnableVSyncNotification(false);
-  input_handler_client_on_impl_thread_.reset();
   layer_tree_host_impl_.reset();
   scheduler_on_impl_thread_.reset();
   weak_factory_on_impl_thread_.InvalidateWeakPtrs();
   vsync_client_ = NULL;
   completion->Signal();
 }
 
 size_t ThreadProxy::MaxPartialTextureUpdates() const {
   return ResourceUpdateController::MaxPartialTextureUpdates();
 }
@@ skipping 176 matching lines @@
 
 void ThreadProxy::DidReceiveLastInputEventForVSync(
     base::TimeTicks frame_time) {
   if (render_vsync_notification_enabled_) {
     TRACE_EVENT0("cc", "ThreadProxy::DidReceiveLastInputEventForVSync");
     DidVSync(frame_time);
   }
 }
 
 }  // namespace cc