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

Side by Side Diff: ui/events/event.cc

Issue 2752093004: Makes KeyEvent struct traits restore Event::time_stamp() field (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « ui/events/event.h ('k') | ui/events/mojo/event_struct_traits.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/event.h" 5 #include "ui/events/event.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 10
(...skipping 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after
1186 // Only Windows has native character events. 1186 // Only Windows has native character events.
1187 if (is_char_) 1187 if (is_char_)
1188 key_ = DomKey::FromCharacter(native_event.wParam); 1188 key_ = DomKey::FromCharacter(native_event.wParam);
1189 else 1189 else
1190 key_ = PlatformKeyMap::DomKeyFromKeyboardCode(key_code(), flags()); 1190 key_ = PlatformKeyMap::DomKeyFromKeyboardCode(key_code(), flags());
1191 #endif 1191 #endif
1192 } 1192 }
1193 1193
1194 KeyEvent::KeyEvent(EventType type, 1194 KeyEvent::KeyEvent(EventType type,
1195 KeyboardCode key_code, 1195 KeyboardCode key_code,
1196 int flags) 1196 int flags,
1197 : Event(type, EventTimeForNow(), flags), 1197 base::TimeTicks time_stamp)
1198 : Event(type,
1199 time_stamp == base::TimeTicks() ? EventTimeForNow() : time_stamp,
1200 flags),
1198 key_code_(key_code), 1201 key_code_(key_code),
1199 code_(UsLayoutKeyboardCodeToDomCode(key_code)) { 1202 code_(UsLayoutKeyboardCodeToDomCode(key_code)) {}
1200 }
1201 1203
1202 KeyEvent::KeyEvent(EventType type, 1204 KeyEvent::KeyEvent(EventType type,
1203 KeyboardCode key_code, 1205 KeyboardCode key_code,
1204 DomCode code, 1206 DomCode code,
1205 int flags) 1207 int flags)
1206 : Event(type, EventTimeForNow(), flags), 1208 : Event(type, EventTimeForNow(), flags),
1207 key_code_(key_code), 1209 key_code_(key_code),
1208 code_(code) { 1210 code_(code) {
1209 } 1211 }
1210 1212
1211 KeyEvent::KeyEvent(EventType type, 1213 KeyEvent::KeyEvent(EventType type,
1212 KeyboardCode key_code, 1214 KeyboardCode key_code,
1213 DomCode code, 1215 DomCode code,
1214 int flags, 1216 int flags,
1215 DomKey key, 1217 DomKey key,
1216 base::TimeTicks time_stamp) 1218 base::TimeTicks time_stamp)
1217 : Event(type, time_stamp, flags), 1219 : Event(type, time_stamp, flags),
1218 key_code_(key_code), 1220 key_code_(key_code),
1219 code_(code), 1221 code_(code),
1220 key_(key) {} 1222 key_(key) {}
1221 1223
1222 KeyEvent::KeyEvent(base::char16 character, KeyboardCode key_code, int flags) 1224 KeyEvent::KeyEvent(base::char16 character,
1223 : Event(ET_KEY_PRESSED, EventTimeForNow(), flags), 1225 KeyboardCode key_code,
1226 int flags,
1227 base::TimeTicks time_stamp)
1228 : Event(ET_KEY_PRESSED,
1229 time_stamp == base::TimeTicks() ? EventTimeForNow() : time_stamp,
1230 flags),
1224 key_code_(key_code), 1231 key_code_(key_code),
1225 code_(DomCode::NONE), 1232 code_(DomCode::NONE),
1226 is_char_(true), 1233 is_char_(true),
1227 key_(DomKey::FromCharacter(character)) { 1234 key_(DomKey::FromCharacter(character)) {}
1228 }
1229 1235
1230 KeyEvent::KeyEvent(const KeyEvent& rhs) 1236 KeyEvent::KeyEvent(const KeyEvent& rhs)
1231 : Event(rhs), 1237 : Event(rhs),
1232 key_code_(rhs.key_code_), 1238 key_code_(rhs.key_code_),
1233 code_(rhs.code_), 1239 code_(rhs.code_),
1234 is_char_(rhs.is_char_), 1240 is_char_(rhs.is_char_),
1235 key_(rhs.key_) { 1241 key_(rhs.key_) {
1236 } 1242 }
1237 1243
1238 KeyEvent& KeyEvent::operator=(const KeyEvent& rhs) { 1244 KeyEvent& KeyEvent::operator=(const KeyEvent& rhs) {
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
1465 flags | EF_FROM_TOUCH), 1471 flags | EF_FROM_TOUCH),
1466 details_(details), 1472 details_(details),
1467 unique_touch_event_id_(unique_touch_event_id) { 1473 unique_touch_event_id_(unique_touch_event_id) {
1468 latency()->set_source_event_type(ui::SourceEventType::TOUCH); 1474 latency()->set_source_event_type(ui::SourceEventType::TOUCH);
1469 } 1475 }
1470 1476
1471 GestureEvent::~GestureEvent() { 1477 GestureEvent::~GestureEvent() {
1472 } 1478 }
1473 1479
1474 } // namespace ui 1480 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/event.h ('k') | ui/events/mojo/event_struct_traits.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698