Index: content/shell/renderer/test_runner/event_sender.cc |
diff --git a/content/shell/renderer/test_runner/event_sender.cc b/content/shell/renderer/test_runner/event_sender.cc |
index f4948b60df0def7b27cfd9309fe802bd4de9b0bf..9f1adcb654b26b4c1271738b8a1ffa1531944677 100644 |
--- a/content/shell/renderer/test_runner/event_sender.cc |
+++ b/content/shell/renderer/test_runner/event_sender.cc |
@@ -1272,6 +1272,7 @@ void EventSender::KeyDown(const std::string& code_str, |
int text = 0; |
bool needs_shift_key_modifier = false; |
std::string domString; |
+ std::string domKey; |
if ("\n" == code_str) { |
generate_char = true; |
@@ -1313,24 +1314,31 @@ void EventSender::KeyDown(const std::string& code_str, |
} else if ("menu" == code_str) { |
code = ui::VKEY_APPS; |
domString.assign("ContextMenu"); |
+ domKey.assign("MediaApps"); |
} else if ("leftControl" == code_str) { |
code = ui::VKEY_LCONTROL; |
domString.assign("ControlLeft"); |
+ domKey.assign("Control"); |
} else if ("rightControl" == code_str) { |
code = ui::VKEY_RCONTROL; |
domString.assign("ControlRight"); |
+ domKey.assign("Control"); |
} else if ("leftShift" == code_str) { |
code = ui::VKEY_LSHIFT; |
domString.assign("ShiftLeft"); |
+ domKey.assign("Shift"); |
} else if ("rightShift" == code_str) { |
code = ui::VKEY_RSHIFT; |
domString.assign("ShiftRight"); |
+ domKey.assign("Shift"); |
} else if ("leftAlt" == code_str) { |
code = ui::VKEY_LMENU; |
domString.assign("AltLeft"); |
+ domKey.assign("Alt"); |
} else if ("rightAlt" == code_str) { |
code = ui::VKEY_RMENU; |
domString.assign("AltRight"); |
+ domKey.assign("AltGraph"); |
} else if ("numLock" == code_str) { |
code = ui::VKEY_NUMLOCK; |
domString.assign("NumLock"); |
@@ -1391,6 +1399,10 @@ void EventSender::KeyDown(const std::string& code_str, |
event_down.windowsKeyCode = code; |
event_down.domCode = static_cast<int>( |
ui::KeycodeConverter::CodeStringToDomCode(domString.c_str())); |
+ if (domKey.empty()) |
+ domKey = domString; |
+ event_down.domKey = static_cast<int>( |
+ ui::KeycodeConverter::KeyStringToDomKey(domKey.c_str())); |
if (generate_char) { |
event_down.text[0] = text; |