diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-09-12 12:10:22 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-09-12 12:10:22 +0100 |
| commit | 58537e28ecd584eab876aee8be7156509866d23a (patch) | |
| tree | 8988984e52090aaadf33cff139d7dd212cd13656 /media/base/keyboard_event_counter.cc | |
| parent | 0a1b11dee8e5cb2520121c300858fea6138e3c54 (diff) | |
| download | chromium_org-58537e28ecd584eab876aee8be7156509866d23a.tar.gz | |
Merge from Chromium at DEPS revision 222756
This commit was generated by merge_to_master.py.
Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
Diffstat (limited to 'media/base/keyboard_event_counter.cc')
| -rw-r--r-- | media/base/keyboard_event_counter.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/base/keyboard_event_counter.cc b/media/base/keyboard_event_counter.cc index a4ae1097f8..8432aec37e 100644 --- a/media/base/keyboard_event_counter.cc +++ b/media/base/keyboard_event_counter.cc @@ -15,7 +15,8 @@ KeyboardEventCounter::~KeyboardEventCounter() {} void KeyboardEventCounter::Reset() { pressed_keys_.clear(); - total_key_presses_ = 0; + base::subtle::NoBarrier_Store( + reinterpret_cast<base::subtle::AtomicWord*>(&total_key_presses_), 0); } void KeyboardEventCounter::OnKeyboardEvent(ui::EventType event, |