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

Side by Side Diff: third_party/WebKit/Source/core/events/KeyboardEvent.cpp

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 unified diff | Download patch
OLDNEW
1 /** 1 /**
2 * Copyright (C) 2001 Peter Kelly (pmk@post.com) 2 * Copyright (C) 2001 Peter Kelly (pmk@post.com)
3 * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de) 3 * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de)
4 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
5 * Copyright (C) 2003, 2005, 2006, 2007 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 // Char events. 47 // Char events.
48 break; 48 break;
49 default: 49 default:
50 break; 50 break;
51 } 51 }
52 NOTREACHED(); 52 NOTREACHED();
53 return EventTypeNames::keydown; 53 return EventTypeNames::keydown;
54 } 54 }
55 55
56 KeyboardEvent::KeyLocationCode keyLocationCode(const WebInputEvent& key) { 56 KeyboardEvent::KeyLocationCode keyLocationCode(const WebInputEvent& key) {
57 if (key.modifiers & WebInputEvent::IsKeyPad) 57 if (key.modifiers() & WebInputEvent::IsKeyPad)
58 return KeyboardEvent::kDomKeyLocationNumpad; 58 return KeyboardEvent::kDomKeyLocationNumpad;
59 if (key.modifiers & WebInputEvent::IsLeft) 59 if (key.modifiers() & WebInputEvent::IsLeft)
60 return KeyboardEvent::kDomKeyLocationLeft; 60 return KeyboardEvent::kDomKeyLocationLeft;
61 if (key.modifiers & WebInputEvent::IsRight) 61 if (key.modifiers() & WebInputEvent::IsRight)
62 return KeyboardEvent::kDomKeyLocationRight; 62 return KeyboardEvent::kDomKeyLocationRight;
63 return KeyboardEvent::kDomKeyLocationStandard; 63 return KeyboardEvent::kDomKeyLocationStandard;
64 } 64 }
65 65
66 bool hasCurrentComposition(LocalDOMWindow* domWindow) { 66 bool hasCurrentComposition(LocalDOMWindow* domWindow) {
67 if (!domWindow) 67 if (!domWindow)
68 return false; 68 return false;
69 LocalFrame* localFrame = domWindow->frame(); 69 LocalFrame* localFrame = domWindow->frame();
70 if (!localFrame) 70 if (!localFrame)
71 return false; 71 return false;
(...skipping 10 matching lines...) Expand all
82 initializer.ctrlKey(), initializer.altKey(), initializer.shiftKey(), 82 initializer.ctrlKey(), initializer.altKey(), initializer.shiftKey(),
83 initializer.metaKey()); 83 initializer.metaKey());
84 return new KeyboardEvent(type, initializer); 84 return new KeyboardEvent(type, initializer);
85 } 85 }
86 86
87 KeyboardEvent::KeyboardEvent() : m_location(kDomKeyLocationStandard) {} 87 KeyboardEvent::KeyboardEvent() : m_location(kDomKeyLocationStandard) {}
88 88
89 KeyboardEvent::KeyboardEvent(const WebKeyboardEvent& key, 89 KeyboardEvent::KeyboardEvent(const WebKeyboardEvent& key,
90 LocalDOMWindow* domWindow) 90 LocalDOMWindow* domWindow)
91 : UIEventWithKeyState( 91 : UIEventWithKeyState(
92 eventTypeForKeyboardEventType(key.type), 92 eventTypeForKeyboardEventType(key.type()),
93 true, 93 true,
94 true, 94 true,
95 domWindow, 95 domWindow,
96 0, 96 0,
97 static_cast<PlatformEvent::Modifiers>(key.modifiers), 97 static_cast<PlatformEvent::Modifiers>(key.modifiers()),
98 TimeTicks::FromSeconds(key.timeStampSeconds), 98 TimeTicks::FromSeconds(key.timeStampSeconds()),
99 InputDeviceCapabilities::doesntFireTouchEventsSourceCapabilities()), 99 InputDeviceCapabilities::doesntFireTouchEventsSourceCapabilities()),
100 m_keyEvent(WTF::makeUnique<WebKeyboardEvent>(key)), 100 m_keyEvent(WTF::makeUnique<WebKeyboardEvent>(key)),
101 // TODO(crbug.com/482880): Fix this initialization to lazy initialization. 101 // TODO(crbug.com/482880): Fix this initialization to lazy initialization.
102 m_code(Platform::current()->domCodeStringFromEnum(key.domCode)), 102 m_code(Platform::current()->domCodeStringFromEnum(key.domCode)),
103 m_key(Platform::current()->domKeyStringFromEnum(key.domKey)), 103 m_key(Platform::current()->domKeyStringFromEnum(key.domKey)),
104 m_location(keyLocationCode(key)), 104 m_location(keyLocationCode(key)),
105 m_isComposing(hasCurrentComposition(domWindow)) { 105 m_isComposing(hasCurrentComposition(domWindow)) {
106 initLocationModifiers(m_location); 106 initLocationModifiers(m_location);
107 } 107 }
108 108
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 m_modifiers |= PlatformEvent::IsRight; 202 m_modifiers |= PlatformEvent::IsRight;
203 break; 203 break;
204 } 204 }
205 } 205 }
206 206
207 DEFINE_TRACE(KeyboardEvent) { 207 DEFINE_TRACE(KeyboardEvent) {
208 UIEventWithKeyState::trace(visitor); 208 UIEventWithKeyState::trace(visitor);
209 } 209 }
210 210
211 } // namespace blink 211 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/events/GestureEvent.cpp ('k') | third_party/WebKit/Source/core/events/MouseEvent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698