Delay Input.dispatchKeyEvent response until after key event ack.

content/browser/devtools/protocol/input_handler.cc

 // Copyright 2014 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/devtools/protocol/input_handler.h"
 
 #include <stddef.h>
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 119 matching lines @@
 
 InputHandler::InputHandler()
     : host_(NULL),
       page_scale_factor_(1.0),
       weak_factory_(this) {
 }
 
 InputHandler::~InputHandler() {
 }
 
+void InputHandler::OnInputEventAck(const blink::WebInputEvent& event,
+                                   bool is_synthetic) {
+  if (!is_synthetic)
+    return;
+
+  if (blink::WebInputEvent::isKeyboardEventType(event.type) &&
+      !pending_key_event_ids_.empty()) {
+    SendDispatchKeyEventResponse(pending_key_event_ids_.front());
+    pending_key_event_ids_.pop_front();
+  } else if (blink::WebInputEvent::isMouseEventType(event.type) &&
+             !pending_mouse_event_ids_.empty()) {
+    SendDispatchMouseEventResponse(pending_mouse_event_ids_.front());
+    pending_mouse_event_ids_.pop_front();
+  }
+}
+
 void InputHandler::SetRenderWidgetHost(RenderWidgetHostImpl* host) {
+  for (const DevToolsCommandId& command_id : pending_key_event_ids_)
+    SendDispatchKeyEventResponse(command_id);
+  pending_key_event_ids_.clear();
+
+  for (const DevToolsCommandId& command_id : pending_mouse_event_ids_)
+    SendDispatchMouseEventResponse(command_id);
+  pending_mouse_event_ids_.clear();
+
+  if (host_)
+    host_->RemoveInputEventObserver(this);
+  if (host)
+    host->AddInputEventObserver(this);
+
   host_ = host;
 }
 
 void InputHandler::SetClient(std::unique_ptr<Client> client) {
   client_.swap(client);
 }
 
 void InputHandler::OnSwapCompositorFrame(
     const cc::CompositorFrameMetadata& frame_metadata) {
   page_scale_factor_ = frame_metadata.page_scale_factor;
   scrollable_viewport_size_ = frame_metadata.scrollable_viewport_size;
 }
 
 Response InputHandler::DispatchKeyEvent(
+    DevToolsCommandId command_id,
     const std::string& type,
     const int* modifiers,
     const double* timestamp,
     const std::string* text,
     const std::string* unmodified_text,
     const std::string* key_identifier,
     const std::string* code,
     const std::string* key,
     const int* windows_virtual_key_code,
     const int* native_virtual_key_code,
     const bool* auto_repeat,
     const bool* is_keypad,
     const bool* is_system_key) {
   NativeWebKeyboardEvent event;
   event.skip_in_browser = true;
+  event.is_synthetic = true;
 
   if (type == dispatch_key_event::kTypeKeyDown) {
     event.type = blink::WebInputEvent::KeyDown;
   } else if (type == dispatch_key_event::kTypeKeyUp) {
     event.type = blink::WebInputEvent::KeyUp;
   } else if (type == dispatch_key_event::kTypeChar) {
     event.type = blink::WebInputEvent::Char;
   } else if (type == dispatch_key_event::kTypeRawKeyDown) {
     event.type = blink::WebInputEvent::RawKeyDown;
   } else {
@@ skipping 25 matching lines @@
   }
 
   if (key) {
     event.domKey = static_cast<int>(
         ui::KeycodeConverter::KeyStringToDomKey(*key));
   }
 
   if (!host_)
     return Response::ServerError("Could not connect to view");
 
+  pending_key_event_ids_.push_back(command_id);
   host_->Focus();
   host_->ForwardKeyboardEvent(event);
   return Response::OK();
 }
 
 Response InputHandler::DispatchMouseEvent(
+    DevToolsCommandId command_id,
     const std::string& type,
     int x,
     int y,
     const int* modifiers,
     const double* timestamp,
     const std::string* button,
     const int* click_count) {
   blink::WebMouseEvent event;
 
   if (!SetMouseEventType(&event, type)) {
@@ skipping 10 matching lines @@
   event.windowX = x * page_scale_factor_;
   event.windowY = y * page_scale_factor_;
   event.globalX = x * page_scale_factor_;
   event.globalY = y * page_scale_factor_;
   event.clickCount = click_count ? *click_count : 0;
   event.pointerType = blink::WebPointerProperties::PointerType::Mouse;
 
   if (!host_)
     return Response::ServerError("Could not connect to view");
 
+  pending_mouse_event_ids_.push_back(command_id);
   host_->Focus();
   host_->ForwardMouseEvent(event);
   return Response::OK();
 }
 
 Response InputHandler::EmulateTouchFromMouseEvent(const std::string& type,
                                                   int x,
                                                   int y,
                                                   double timestamp,
                                                   const std::string& button,
@@ skipping 203 matching lines @@
     bool is_last_tap = i == *tap_count - 1;
     host_->QueueSyntheticGesture(
         SyntheticGesture::Create(gesture_params),
         base::Bind(&InputHandler::SendSynthesizeTapGestureResponse,
                    weak_factory_.GetWeakPtr(), command_id, is_last_tap));
   }
 
   return Response::OK();
 }
 
+void InputHandler::SendDispatchKeyEventResponse(DevToolsCommandId command_id) {
+  client_->SendDispatchKeyEventResponse(
+      command_id, DispatchKeyEventResponse::Create());
+}
+
+void InputHandler::SendDispatchMouseEventResponse(
+    DevToolsCommandId command_id) {
+  client_->SendDispatchMouseEventResponse(
+      command_id, DispatchMouseEventResponse::Create());
+}
+
 void InputHandler::SendSynthesizePinchGestureResponse(
     DevToolsCommandId command_id,
     SyntheticGesture::Result result) {
   if (result == SyntheticGesture::Result::GESTURE_FINISHED) {
     client_->SendSynthesizePinchGestureResponse(
         command_id, SynthesizePinchGestureResponse::Create());
   } else {
     client_->SendError(command_id,
                        Response::InternalError(base::StringPrintf(
                            "Synthetic pinch failed, result was %d", result)));
@@ skipping 25 matching lines @@
   } else {
     client_->SendError(command_id,
                        Response::InternalError(base::StringPrintf(
                            "Synthetic tap failed, result was %d", result)));
   }
 }
 
 }  // namespace input
 }  // namespace devtools
 }  // namespace content