sync compositor: Remove sync input path

content/browser/android/synchronous_compositor_host.cc

 // Copyright 2015 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/browser/android/synchronous_compositor_host.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
@@ skipping 35 matching lines @@
 std::unique_ptr<SynchronousCompositorHost> SynchronousCompositorHost::Create(
     RenderWidgetHostViewAndroid* rwhva,
     WebContents* web_contents) {
   DCHECK(web_contents);
   WebContentsAndroid* web_contents_android =
       static_cast<WebContentsImpl*>(web_contents)->GetWebContentsAndroid();
   if (!web_contents_android->synchronous_compositor_client())
     return nullptr;  // Not using sync compositing.
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  bool async_input =
-      !command_line->HasSwitch(switches::kSyncInputForSyncCompositor);
   bool use_in_proc_software_draw =
       command_line->HasSwitch(switches::kSingleProcess);
   return base::WrapUnique(new SynchronousCompositorHost(
-      rwhva, web_contents_android->synchronous_compositor_client(), async_input,
+      rwhva, web_contents_android->synchronous_compositor_client(),
       use_in_proc_software_draw));
 }
 
 SynchronousCompositorHost::SynchronousCompositorHost(
     RenderWidgetHostViewAndroid* rwhva,
     SynchronousCompositorClient* client,
-    bool async_input,
     bool use_in_proc_software_draw)
     : rwhva_(rwhva),
       client_(client),
       ui_task_runner_(
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)),
       routing_id_(rwhva_->GetRenderWidgetHost()->GetRoutingID()),
       sender_(rwhva_->GetRenderWidgetHost()),
-      async_input_(async_input),
       use_in_process_zero_copy_software_draw_(use_in_proc_software_draw),
       is_active_(false),
       bytes_limit_(0u),
       renderer_param_version_(0u),
       need_animate_scroll_(false),
       need_invalidate_count_(0u),
       need_begin_frame_(false),
       did_activate_pending_tree_count_(0u),
       weak_ptr_factory_(this) {
   client_->DidInitializeCompositor(this);
 }
 
 SynchronousCompositorHost::~SynchronousCompositorHost() {
   client_->DidDestroyCompositor(this);
   if (weak_ptr_factory_.HasWeakPtrs())
     UpdateStateTask();
 }
 
 bool SynchronousCompositorHost::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SynchronousCompositorHost, message)
     IPC_MESSAGE_HANDLER(SyncCompositorHostMsg_OutputSurfaceCreated,
                         OutputSurfaceCreated)
     IPC_MESSAGE_HANDLER(SyncCompositorHostMsg_UpdateState, ProcessCommonParams)
-    IPC_MESSAGE_HANDLER(SyncCompositorHostMsg_OverScroll, OnOverScroll)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void SynchronousCompositorHost::DidBecomeCurrent() {
   client_->DidBecomeCurrent(this);
 }
 
 SynchronousCompositor::Frame SynchronousCompositorHost::DemandDrawHw(
@@ skipping 265 matching lines @@
     return;
   need_animate_scroll_ = false;
 
   SyncCompositorCommonBrowserParams common_browser_params;
   PopulateCommonParams(&common_browser_params);
   SyncCompositorCommonRendererParams common_renderer_params;
   sender_->Send(new SyncCompositorMsg_ComputeScroll(
       routing_id_, common_browser_params, animation_time));
 }
 
-InputEventAckState SynchronousCompositorHost::HandleInputEvent(
-    const blink::WebInputEvent& input_event) {
-  if (async_input_)
-    return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
-  SyncCompositorCommonBrowserParams common_browser_params;
-  PopulateCommonParams(&common_browser_params);
-  SyncCompositorCommonRendererParams common_renderer_params;
-  InputEventAckState ack = INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
-  if (!sender_->Send(new SyncCompositorMsg_HandleInputEvent(
-          routing_id_, common_browser_params, &input_event,
-          &common_renderer_params, &ack))) {
-    return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
-  }
-  ProcessCommonParams(common_renderer_params);
-  return ack;
-}
-
 void SynchronousCompositorHost::DidOverscroll(
     const DidOverscrollParams& over_scroll_params) {
   client_->DidOverscroll(over_scroll_params.accumulated_overscroll,
                          over_scroll_params.latest_overscroll_delta,
                          over_scroll_params.current_fling_velocity);
 }
 
 void SynchronousCompositorHost::BeginFrame(const cc::BeginFrameArgs& args) {
   if (!is_active_)
     return;
 
   SyncCompositorCommonBrowserParams common_browser_params;
   PopulateCommonParams(&common_browser_params);
   SyncCompositorCommonRendererParams common_renderer_params;
   if (!sender_->Send(
           new SyncCompositorMsg_BeginFrame(routing_id_, common_browser_params,
                                            args, &common_renderer_params))) {
     return;
   }
   ProcessCommonParams(common_renderer_params);
 }
 
 void SynchronousCompositorHost::OutputSurfaceCreated() {
   // New output surface is not aware of state from Browser side. So need to
   // re-send all browser side state here.
   sender_->Send(
       new SyncCompositorMsg_SetMemoryPolicy(routing_id_, bytes_limit_));
 }
 
-void SynchronousCompositorHost::OnOverScroll(
-    const SyncCompositorCommonRendererParams& params,
-    const DidOverscrollParams& over_scroll_params) {
-  ProcessCommonParams(params);
-  DidOverscroll(over_scroll_params);
-}
-
 void SynchronousCompositorHost::PopulateCommonParams(
     SyncCompositorCommonBrowserParams* params) {
   DCHECK(params);
   params->begin_frame_source_paused = !is_active_;
 
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 void SynchronousCompositorHost::ProcessCommonParams(
     const SyncCompositorCommonRendererParams& params) {
@@ skipping 31 matching lines @@
         params.scrollable_size, params.page_scale_factor,
         params.min_page_scale_factor, params.max_page_scale_factor);
   }
 }
 
 void SynchronousCompositorHost::UpdateNeedsBeginFrames() {
   rwhva_->OnSetNeedsBeginFrames(is_active_ && need_begin_frame_);
 }
 
 }  // namespace content