Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(815)

Unified Diff: ui/events/blink/web_input_event.cc

Issue 2573073003: Collapse the API surface on WebInputEvent via accessor functions. (Closed)
Patch Set: Fix nits Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/events/blink/web_input_event.cc
diff --git a/ui/events/blink/web_input_event.cc b/ui/events/blink/web_input_event.cc
index 3476f003322d260072713e558e7fabcc0b744721..b423f466b73167a7d9a497fb4048afcd828004f4 100644
--- a/ui/events/blink/web_input_event.cc
+++ b/ui/events/blink/web_input_event.cc
@@ -109,7 +109,7 @@ blink::WebKeyboardEvent MakeWebKeyboardEventFromUiEvent(const KeyEvent& event) {
DomCodeToWebInputEventModifiers(event.code()),
EventTimeStampToSeconds(event.time_stamp()));
- if (webkit_event.modifiers & blink::WebInputEvent::AltKey)
+ if (webkit_event.modifiers() & blink::WebInputEvent::AltKey)
webkit_event.isSystemKey = true;
// TODO(dtapuska): crbug.com/570388. Ozone appears to deliver
@@ -321,7 +321,8 @@ blink::WebKeyboardEvent MakeWebKeyboardEvent(const KeyEvent& event) {
// Key events require no translation.
blink::WebKeyboardEvent webkit_event(MakeWebKeyboardEventFromNativeEvent(
event.native_event(), event.time_stamp()));
- webkit_event.modifiers |= DomCodeToWebInputEventModifiers(event.code());
+ webkit_event.setModifiers(webkit_event.modifiers() |
+ DomCodeToWebInputEventModifiers(event.code()));
webkit_event.domCode = static_cast<int>(event.code());
webkit_event.domKey = static_cast<int>(event.GetDomKey());
return webkit_event;
« no previous file with comments | « ui/events/blink/input_scroll_elasticity_controller.cc ('k') | ui/events/blink/web_input_event_builders_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698