mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

refactor: remove unnecessary copied helper (#25668)

Browse source
This commit is contained in:
Shelley Vohr 2020-09-29 08:40:31 -07:00 • committed by GitHub
parent f3c53c1f10
commit 99a4284174
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
shell/common/gin_converters/blink_converter.cc
View file

@ -25,6 +25,7 @@
#include "third_party/blink/public/common/widget/device_emulation_params.h"
#include "third_party/blink/public/platform/web_size.h"
#include "ui/base/clipboard/clipboard.h"
#include "ui/events/blink/blink_event_util.h"
#include "ui/events/keycodes/dom/keycode_converter.h"
#include "ui/events/keycodes/keyboard_code_conversion.h"
@ -197,7 +198,7 @@ bool Converter<blink::WebKeyboardEvent>::FromV8(v8::Isolate* isolate,
ui::DomKey domKey;
ui::KeyboardCode dummy_code;
int flags = electron::WebEventModifiersToEventFlags(out->GetModifiers());
int flags = ui::WebEventModifiersToEventFlags(out->GetModifiers());
if (ui::DomCodeToUsLayoutDomKey(domCode, flags, &domKey, &dummy_code))
out->dom_key = static_cast<int>(domKey);

29
shell/common/keyboard_util.cc
View file

@ -326,33 +326,4 @@ ui::KeyboardCode KeyboardCodeFromStr(const std::string& str, bool* shifted) {
return KeyboardCodeFromKeyIdentifier(str, shifted);
}
int WebEventModifiersToEventFlags(int modifiers) {
int flags = 0;
if (modifiers & blink::WebInputEvent::Modifiers::kShiftKey)
flags |= ui::EF_SHIFT_DOWN;
if (modifiers & blink::WebInputEvent::Modifiers::kControlKey)
flags |= ui::EF_CONTROL_DOWN;
if (modifiers & blink::WebInputEvent::Modifiers::kAltKey)
flags |= ui::EF_ALT_DOWN;
if (modifiers & blink::WebInputEvent::Modifiers::kMetaKey)
flags |= ui::EF_COMMAND_DOWN;
if (modifiers & blink::WebInputEvent::Modifiers::kCapsLockOn)
flags |= ui::EF_CAPS_LOCK_ON;
if (modifiers & blink::WebInputEvent::Modifiers::kNumLockOn)
flags |= ui::EF_NUM_LOCK_ON;
if (modifiers & blink::WebInputEvent::Modifiers::kScrollLockOn)
flags |= ui::EF_SCROLL_LOCK_ON;
if (modifiers & blink::WebInputEvent::Modifiers::kLeftButtonDown)
flags |= ui::EF_LEFT_MOUSE_BUTTON;
if (modifiers & blink::WebInputEvent::Modifiers::kMiddleButtonDown)
flags |= ui::EF_MIDDLE_MOUSE_BUTTON;
if (modifiers & blink::WebInputEvent::Modifiers::kRightButtonDown)
flags |= ui::EF_RIGHT_MOUSE_BUTTON;
if (modifiers & blink::WebInputEvent::Modifiers::kIsAutoRepeat)
flags |= ui::EF_IS_REPEAT;
return flags;
}
} // namespace electron

3
shell/common/keyboard_util.h
View file

@ -20,9 +20,6 @@ ui::KeyboardCode KeyboardCodeFromCharCode(base::char16 c, bool* shifted);
// pressed.
ui::KeyboardCode KeyboardCodeFromStr(const std::string& str, bool* shifted);
// Ported from ui/events/blink/blink_event_util.h
int WebEventModifiersToEventFlags(int modifiers);
} // namespace electron
#endif // SHELL_COMMON_KEYBOARD_UTIL_H_