| Index: content/renderer/render_widget.cc
|
| diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
|
| index 592a57c0c1d3a076f4b8354c9affead6d7f5bdd3..331bd92a37f568de6445b9322083d0c01d5266d9 100644
|
| --- a/content/renderer/render_widget.cc
|
| +++ b/content/renderer/render_widget.cc
|
| @@ -971,10 +971,11 @@ GURL RenderWidget::GetURLForGraphicsContext3D() {
|
| }
|
|
|
| void RenderWidget::OnHandleInputEvent(const blink::WebInputEvent* input_event,
|
| - const ui::LatencyInfo& latency_info) {
|
| + const ui::LatencyInfo& latency_info,
|
| + InputEventDispatchType dispatch_type) {
|
| if (!input_event)
|
| return;
|
| - input_handler_->HandleInputEvent(*input_event, latency_info);
|
| + input_handler_->HandleInputEvent(*input_event, latency_info, dispatch_type);
|
| }
|
|
|
| void RenderWidget::OnCursorVisibilityChange(bool is_visible) {
|
| @@ -1274,6 +1275,17 @@ void RenderWidget::OnInputEventAck(scoped_ptr<InputEventAck> input_event_ack) {
|
| Send(new InputHostMsg_HandleInputEvent_ACK(routing_id_, *input_event_ack));
|
| }
|
|
|
| +void RenderWidget::NonBlockingInputEventHandled(
|
| + blink::WebInputEvent::Type handled_type) {
|
| + RenderThreadImpl* render_thread = RenderThreadImpl::current();
|
| + InputHandlerManager* input_handler_manager =
|
| + render_thread ? render_thread->input_handler_manager() : NULL;
|
| + if (input_handler_manager) {
|
| + input_handler_manager->NonBlockingInputEventHandledOnMainThread(
|
| + routing_id_, handled_type);
|
| + }
|
| +}
|
| +
|
| void RenderWidget::SetInputHandler(RenderWidgetInputHandler* input_handler) {
|
| // Nothing to do here. RenderWidget created the |input_handler| and will take
|
| // ownership of it. We just verify here that we don't already have an input
|
|
|