ChromeDriver: Handle key events properly on Mac

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"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "content/browser/devtools/devtools_session.h"
+#include "content/browser/devtools/protocol/native_input_event_builder.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/input/synthetic_pinch_gesture_params.h"
 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
 #include "content/common/input/synthetic_tap_gesture_params.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace content {
@@ skipping 254 matching lines @@
         base::StringPrintf("Unexpected event type '%s'", type.c_str())));
     return;
   }
 
   NativeWebKeyboardEvent event(
       web_event_type,
       GetEventModifiers(modifiers.fromMaybe(blink::WebInputEvent::NoModifiers),
                         auto_repeat.fromMaybe(false),
                         is_keypad.fromMaybe(false)),
       GetEventTimeTicks(std::move(timestamp)));
-  event.skip_in_browser = true;
+
   if (!SetKeyboardEventText(event.text, std::move(text))) {
     callback->sendFailure(Response::InvalidParams("Invalid 'text' parameter"));
     return;
   }
   if (!SetKeyboardEventText(event.unmodifiedText, std::move(unmodified_text))) {
     callback->sendFailure(
         Response::InvalidParams("Invalid 'unmodifiedText' parameter"));
     return;
   }
 
@@ skipping 11 matching lines @@
 
   if (key.isJust()) {
     event.domKey = static_cast<int>(
         ui::KeycodeConverter::KeyStringToDomKey(key.fromJust()));
   }
 
   if (!host_ || !host_->GetRenderWidgetHost()) {
     callback->sendFailure(Response::InternalError());
     return;
   }
-
+  event.os_event = NativeInputEventBuilder::Build(event);
   host_->GetRenderWidgetHost()->Focus();
   input_queued_ = false;
   pending_key_callbacks_.push_back(std::move(callback));
   host_->GetRenderWidgetHost()->ForwardKeyboardEvent(event);
   if (!input_queued_) {
     pending_key_callbacks_.back()->sendSuccess();
     pending_key_callbacks_.pop_back();
   }
 }
 
@@ skipping 311 matching lines @@
   for (auto& callback : pending_key_callbacks_)
     callback->sendSuccess();
   pending_key_callbacks_.clear();
   for (auto& callback : pending_mouse_callbacks_)
     callback->sendSuccess();
   pending_mouse_callbacks_.clear();
 }
 
 }  // namespace protocol
 }  // namespace content