Index: content/renderer/android/synchronous_compositor_proxy.cc |
diff --git a/content/renderer/android/synchronous_compositor_proxy.cc b/content/renderer/android/synchronous_compositor_proxy.cc |
index ae6a13135e0513262e366ae3b4b190e2126ef289..9703dfb9946b4b3fb134a92821eaf33335eec7b7 100644 |
--- a/content/renderer/android/synchronous_compositor_proxy.cc |
+++ b/content/renderer/android/synchronous_compositor_proxy.cc |
@@ -17,7 +17,6 @@ |
#include "third_party/skia/include/core/SkCanvas.h" |
#include "third_party/skia/include/core/SkImageInfo.h" |
#include "third_party/skia/include/core/SkRegion.h" |
-#include "ui/events/latency_info.h" |
#include "ui/gfx/skia_util.h" |
namespace content { |
@@ -26,13 +25,11 @@ SynchronousCompositorProxy::SynchronousCompositorProxy( |
int routing_id, |
IPC::Sender* sender, |
SynchronousCompositorExternalBeginFrameSource* begin_frame_source, |
- ui::SynchronousInputHandlerProxy* input_handler_proxy, |
- InputHandlerManagerClient::Handler* handler) |
+ ui::SynchronousInputHandlerProxy* input_handler_proxy) |
: routing_id_(routing_id), |
sender_(sender), |
begin_frame_source_(begin_frame_source), |
input_handler_proxy_(input_handler_proxy), |
- input_handler_(handler), |
use_in_process_zero_copy_software_draw_( |
base::CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kSingleProcess)), |
@@ -50,7 +47,6 @@ SynchronousCompositorProxy::SynchronousCompositorProxy( |
did_activate_pending_tree_count_(0u) { |
DCHECK(begin_frame_source_); |
DCHECK(input_handler_proxy_); |
- DCHECK(input_handler_); |
begin_frame_source_->SetClient(this); |
input_handler_proxy_->SetOnlySynchronouslyAnimateRootFlings(this); |
} |
@@ -149,7 +145,6 @@ void SynchronousCompositorProxy::OnMessageReceived( |
return; |
IPC_BEGIN_MESSAGE_MAP(SynchronousCompositorProxy, message) |
- IPC_MESSAGE_HANDLER(SyncCompositorMsg_HandleInputEvent, HandleInputEvent) |
IPC_MESSAGE_HANDLER(SyncCompositorMsg_BeginFrame, BeginFrame) |
IPC_MESSAGE_HANDLER(SyncCompositorMsg_ComputeScroll, OnComputeScroll) |
IPC_MESSAGE_HANDLER_DELAY_REPLY(SyncCompositorMsg_DemandDrawHw, |
@@ -168,21 +163,6 @@ bool SynchronousCompositorProxy::Send(IPC::Message* message) { |
return sender_->Send(message); |
} |
-void SynchronousCompositorProxy::HandleInputEvent( |
- const SyncCompositorCommonBrowserParams& common_params, |
- const blink::WebInputEvent* event, |
- SyncCompositorCommonRendererParams* common_renderer_params, |
- InputEventAckState* ack) { |
- DCHECK(!inside_receive_); |
- base::AutoReset<bool> scoped_inside_receive(&inside_receive_, true); |
- |
- ProcessCommonParams(common_params); |
- DCHECK(!input_handler_->is_null()); |
- ui::LatencyInfo latency; |
- *ack = input_handler_->Run(routing_id_, event, &latency); |
- PopulateCommonParams(common_renderer_params); |
-} |
- |
void SynchronousCompositorProxy::BeginFrame( |
const SyncCompositorCommonBrowserParams& common_params, |
const cc::BeginFrameArgs& args, |
@@ -390,14 +370,6 @@ void SynchronousCompositorProxy::SetScroll( |
input_handler_proxy_->SynchronouslySetRootScrollOffset(total_scroll_offset_); |
} |
-void SynchronousCompositorProxy::DidOverscroll( |
- const DidOverscrollParams& did_overscroll_params) { |
- SyncCompositorCommonRendererParams params; |
- PopulateCommonParams(¶ms); |
- Send(new SyncCompositorHostMsg_OverScroll(routing_id_, params, |
- did_overscroll_params)); |
-} |
- |
void SynchronousCompositorProxy::ProcessCommonParams( |
const SyncCompositorCommonBrowserParams& common_params) { |
begin_frame_source_->SetBeginFrameSourcePaused( |