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

Side by Side Diff: ui/events/ozone/evdev/event_modifiers_evdev.cc

Issue 559713004: ozone: evdev: Convert CHECKs to DCHECKs per style guide (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/events/ozone/evdev/event_modifiers_evdev.h" 5 #include "ui/events/ozone/evdev/event_modifiers_evdev.h"
6 6
7 #include <linux/input.h> 7 #include <linux/input.h>
8 8
9 #include "ui/events/event.h" 9 #include "ui/events/event.h"
10 10
(...skipping 16 matching lines...) Expand all
27 27
28 } // namespace 28 } // namespace
29 29
30 EventModifiersEvdev::EventModifiersEvdev() 30 EventModifiersEvdev::EventModifiersEvdev()
31 : modifier_flags_locked_(0), modifier_flags_(0) { 31 : modifier_flags_locked_(0), modifier_flags_(0) {
32 memset(modifiers_down_, 0, sizeof(modifiers_down_)); 32 memset(modifiers_down_, 0, sizeof(modifiers_down_));
33 } 33 }
34 EventModifiersEvdev::~EventModifiersEvdev() {} 34 EventModifiersEvdev::~EventModifiersEvdev() {}
35 35
36 void EventModifiersEvdev::UpdateModifier(unsigned int modifier, bool down) { 36 void EventModifiersEvdev::UpdateModifier(unsigned int modifier, bool down) {
37 CHECK_LT(modifier, EVDEV_NUM_MODIFIERS); 37 DCHECK_LT(modifier, EVDEV_NUM_MODIFIERS);
38 38
39 if (down) { 39 if (down) {
40 modifiers_down_[modifier]++; 40 modifiers_down_[modifier]++;
41 } else { 41 } else {
42 // Ignore spurious modifier "up" events. This might happen if the 42 // Ignore spurious modifier "up" events. This might happen if the
43 // button is down during startup. 43 // button is down during startup.
44 if (modifiers_down_[modifier]) 44 if (modifiers_down_[modifier])
45 modifiers_down_[modifier]--; 45 modifiers_down_[modifier]--;
46 } 46 }
47 47
48 UpdateFlags(modifier); 48 UpdateFlags(modifier);
49 } 49 }
50 50
51 void EventModifiersEvdev::UpdateModifierLock(unsigned int modifier, bool down) { 51 void EventModifiersEvdev::UpdateModifierLock(unsigned int modifier, bool down) {
52 CHECK_LT(modifier, EVDEV_NUM_MODIFIERS); 52 DCHECK_LT(modifier, EVDEV_NUM_MODIFIERS);
53 53
54 if (down) 54 if (down)
55 modifier_flags_locked_ ^= kEventFlagFromModifiers[modifier]; 55 modifier_flags_locked_ ^= kEventFlagFromModifiers[modifier];
56 56
57 // TODO(spang): Synchronize with the CapsLock LED. 57 // TODO(spang): Synchronize with the CapsLock LED.
58 58
59 UpdateFlags(modifier); 59 UpdateFlags(modifier);
60 } 60 }
61 61
62 void EventModifiersEvdev::UpdateFlags(unsigned int modifier) { 62 void EventModifiersEvdev::UpdateFlags(unsigned int modifier) {
63 int mask = kEventFlagFromModifiers[modifier]; 63 int mask = kEventFlagFromModifiers[modifier];
64 bool down = modifiers_down_[modifier]; 64 bool down = modifiers_down_[modifier];
65 bool locked = (modifier_flags_locked_ & mask); 65 bool locked = (modifier_flags_locked_ & mask);
66 if (down != locked) 66 if (down != locked)
67 modifier_flags_ |= mask; 67 modifier_flags_ |= mask;
68 else 68 else
69 modifier_flags_ &= ~mask; 69 modifier_flags_ &= ~mask;
70 } 70 }
71 71
72 int EventModifiersEvdev::GetModifierFlags() { return modifier_flags_; } 72 int EventModifiersEvdev::GetModifierFlags() { return modifier_flags_; }
73 73
74 // static 74 // static
75 int EventModifiersEvdev::GetEventFlagFromModifier(unsigned int modifier) { 75 int EventModifiersEvdev::GetEventFlagFromModifier(unsigned int modifier) {
76 return kEventFlagFromModifiers[modifier]; 76 return kEventFlagFromModifiers[modifier];
77 } 77 }
78 78
79 } // namespace ui 79 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/ozone/evdev/event_factory_evdev.cc ('k') | ui/events/ozone/evdev/key_event_converter_evdev.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698