Synthesize proper keyIdentifier for devtools protocol key events.

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 "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ skipping 159 matching lines @@
         base::StringPrintf("Unexpected event type '%s'", type.c_str()));
   }
 
   SetEventModifiers(&event, modifiers);
   SetEventTimestamp(&event, timestamp);
   if (!SetKeyboardEventText(event.text, text))
     return Response::InvalidParams("Invalid 'text' parameter");
   if (!SetKeyboardEventText(event.unmodifiedText, unmodified_text))
     return Response::InvalidParams("Invalid 'unmodifiedText' parameter");
 
+  if (windows_virtual_key_code)
+    event.windowsKeyCode = *windows_virtual_key_code;
+  if (native_virtual_key_code)
+    event.nativeKeyCode = *native_virtual_key_code;
+  if (auto_repeat && *auto_repeat)
+    event.modifiers |= blink::WebInputEvent::IsAutoRepeat;
+  if (is_keypad && *is_keypad)
+    event.modifiers |= blink::WebInputEvent::IsKeyPad;
+  if (is_system_key)
+    event.isSystemKey = *is_system_key;
+
   if (key_identifier) {
     if (key_identifier->size() >
         blink::WebKeyboardEvent::keyIdentifierLengthCap) {
       return Response::InvalidParams("Invalid 'keyIdentifier' parameter");
     }
     for (size_t i = 0; i < key_identifier->size(); ++i)
       event.keyIdentifier[i] = (*key_identifier)[i];
+  } else if (event.type != blink::WebInputEvent::Char) {
+    event.setKeyIdentifierFromWindowsKeyCode();
   }
 
   if (code) {
     event.domCode = static_cast<int>(
         ui::KeycodeConverter::CodeStringToDomCode(code->c_str()));
   }
 
-  if (windows_virtual_key_code)
-    event.windowsKeyCode = *windows_virtual_key_code;
-  if (native_virtual_key_code)
-    event.nativeKeyCode = *native_virtual_key_code;
-  if (auto_repeat && *auto_repeat)
-    event.modifiers |= blink::WebInputEvent::IsAutoRepeat;
-  if (is_keypad && *is_keypad)
-    event.modifiers |= blink::WebInputEvent::IsKeyPad;
-  if (is_system_key)
-    event.isSystemKey = *is_system_key;
-
   if (!host_)
     return Response::ServerError("Could not connect to view");
 
   host_->Focus();
   host_->ForwardKeyboardEvent(event);
   return Response::OK();
 }
 
 Response InputHandler::DispatchMouseEvent(
     const std::string& type,
@@ skipping 240 matching lines @@
   } else {
     client_->SendError(command_id,
                        Response::InternalError(base::StringPrintf(
                            "Synthetic tap failed, result was %d", result)));
   }
 }
 
 }  // namespace input
 }  // namespace devtools
 }  // namespace content