commit b0ecffa8d51f9023dfe4af145ab0eb97429910f6
author Tom Sepez <tsepez@chromium.org> Mon Apr 13 20:40:47 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Apr 13 20:40:47 2020 +0000
tree 218ed322cb3a47c142eb1031f42ac1fbb22ebb2b
parent e1998c5d885b62821ec596a0fef4bf272b0bb333

Allow modifiers for keycode events in .evt files.

This is needed to reproduce some bugs under pdfium_test.

Change-Id: I3d045c0e3fe8fb10a48cbe5ceffb423aef2319db
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/68690
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

samples/pdfium_test_event_helper.cc

diff --git a/samples/pdfium_test_event_helper.cc b/samples/pdfium_test_event_helper.cc
index a97d490..2e1abe9 100644
--- a/samples/pdfium_test_event_helper.cc
+++ b/samples/pdfium_test_event_helper.cc
@@ -14,6 +14,19 @@
 #include "testing/fx_string_testhelpers.h"
 
 namespace {
+
+uint32_t GetModifiers(std::string modifiers_string) {
+  uint32_t modifiers = 0;
+  if (modifiers_string.find("shift") != std::string::npos)
+    modifiers |= FWL_EVENTFLAG_ShiftKey;
+  if (modifiers_string.find("control") != std::string::npos)
+    modifiers |= FWL_EVENTFLAG_ControlKey;
+  if (modifiers_string.find("alt") != std::string::npos)
+    modifiers |= FWL_EVENTFLAG_AltKey;
+
+  return modifiers;
+}
+
 void SendCharCodeEvent(FPDF_FORMHANDLE form,
                        FPDF_PAGE page,
                        const std::vector<std::string>& tokens) {
@@ -29,26 +42,15 @@
 void SendKeyCodeEvent(FPDF_FORMHANDLE form,
                       FPDF_PAGE page,
                       const std::vector<std::string>& tokens) {
-  if (tokens.size() != 2) {
+  if (tokens.size() < 2 || tokens.size() > 3) {
     fprintf(stderr, "keycode: bad args\n");
     return;
   }
 
   int keycode = atoi(tokens[1].c_str());
-  FORM_OnKeyDown(form, page, keycode, 0);
-  FORM_OnKeyUp(form, page, keycode, 0);
-}
-
-uint32_t GetModifiers(std::string modifiers_string) {
-  int modifiers = 0;
-  if (modifiers_string.find("shift") != std::string::npos)
-    modifiers |= FWL_EVENTFLAG_ShiftKey;
-  if (modifiers_string.find("control") != std::string::npos)
-    modifiers |= FWL_EVENTFLAG_ControlKey;
-  if (modifiers_string.find("alt") != std::string::npos)
-    modifiers |= FWL_EVENTFLAG_AltKey;
-
-  return modifiers;
+  uint32_t modifiers = tokens.size() >= 3 ? GetModifiers(tokens[2]) : 0;
+  FORM_OnKeyDown(form, page, keycode, modifiers);
+  FORM_OnKeyUp(form, page, keycode, modifiers);
 }
 
 void SendMouseDownEvent(FPDF_FORMHANDLE form,