Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 99 : m_location(DOM_KEY_LOCATION_STANDARD) | 99 : m_location(DOM_KEY_LOCATION_STANDARD) |
| 100 , m_isAutoRepeat(false) | 100 , m_isAutoRepeat(false) |
| 101 { | 101 { |
| 102 } | 102 } |
| 103 | 103 |
| 104 KeyboardEvent::KeyboardEvent(const PlatformKeyboardEvent& key, AbstractView* vie w) | 104 KeyboardEvent::KeyboardEvent(const PlatformKeyboardEvent& key, AbstractView* vie w) |
| 105 : UIEventWithKeyState(eventTypeForKeyboardEventType(key.type()), | 105 : UIEventWithKeyState(eventTypeForKeyboardEventType(key.type()), |
| 106 true, true, view, 0, key.ctrlKey(), key.altKey(), key. shiftKey(), key.metaKey()) | 106 true, true, view, 0, key.ctrlKey(), key.altKey(), key. shiftKey(), key.metaKey()) |
| 107 , m_keyEvent(adoptPtr(new PlatformKeyboardEvent(key))) | 107 , m_keyEvent(adoptPtr(new PlatformKeyboardEvent(key))) |
| 108 , m_keyIdentifier(key.keyIdentifier()) | 108 , m_keyIdentifier(key.keyIdentifier()) |
| 109 , m_code(key.code()) | |
| 109 , m_location(keyLocationCode(key)) | 110 , m_location(keyLocationCode(key)) |
| 110 , m_isAutoRepeat(key.isAutoRepeat()) | 111 , m_isAutoRepeat(key.isAutoRepeat()) |
| 111 { | 112 { |
| 112 setUICreateTime(key.timestamp()); | 113 setUICreateTime(key.timestamp()); |
| 113 } | 114 } |
| 114 | 115 |
| 115 KeyboardEvent::KeyboardEvent(const AtomicString& eventType, const KeyboardEventI nit& initializer) | 116 KeyboardEvent::KeyboardEvent(const AtomicString& eventType, const KeyboardEventI nit& initializer) |
| 116 : UIEventWithKeyState(eventType, initializer.bubbles, initializer.cancelable , initializer.view, initializer.detail, initializer.ctrlKey, initializer.altKey, initializer.shiftKey, initializer.metaKey) | 117 : UIEventWithKeyState(eventType, initializer.bubbles, initializer.cancelable , initializer.view, initializer.detail, initializer.ctrlKey, initializer.altKey, initializer.shiftKey, initializer.metaKey) |
| 117 , m_keyIdentifier(initializer.keyIdentifier) | 118 , m_keyIdentifier(initializer.keyIdentifier) |
| 118 , m_location(initializer.location) | 119 , m_location(initializer.location) |
| 119 , m_isAutoRepeat(initializer.repeat) | 120 , m_isAutoRepeat(initializer.repeat) |
| 120 { | 121 { |
| 121 } | 122 } |
| 122 | 123 |
| 123 KeyboardEvent::KeyboardEvent(const AtomicString& eventType, bool canBubble, bool cancelable, AbstractView *view, | 124 KeyboardEvent::KeyboardEvent(const AtomicString& eventType, bool canBubble, bool cancelable, AbstractView *view, |
| 124 const String &keyIdentifier, unsigned location, | 125 const String& keyIdentifier, const String& code, unsigned location, bool ctr lKey, bool altKey, bool shiftKey, bool metaKey) |
|
Mike West
2015/01/29 11:49:34
Nit: Why reformat this?
Habib Virji
2015/01/29 12:24:14
Since it was more than 4 spaces, pre-submit was gi
| |
| 125 bool ctrlKey, bool altKey, bool shiftKey, bool meta Key) | |
| 126 : UIEventWithKeyState(eventType, canBubble, cancelable, view, 0, ctrlKey, al tKey, shiftKey, metaKey) | 126 : UIEventWithKeyState(eventType, canBubble, cancelable, view, 0, ctrlKey, al tKey, shiftKey, metaKey) |
| 127 , m_keyIdentifier(keyIdentifier) | 127 , m_keyIdentifier(keyIdentifier) |
| 128 , m_code(code) | |
| 128 , m_location(location) | 129 , m_location(location) |
| 129 , m_isAutoRepeat(false) | 130 , m_isAutoRepeat(false) |
| 130 { | 131 { |
| 131 } | 132 } |
| 132 | 133 |
| 133 KeyboardEvent::~KeyboardEvent() | 134 KeyboardEvent::~KeyboardEvent() |
| 134 { | 135 { |
| 135 } | 136 } |
| 136 | 137 |
| 137 void KeyboardEvent::initKeyboardEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView* view, | 138 void KeyboardEvent::initKeyboardEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView* view, |
| 138 const String &keyIdentifier, unsigned loca tion, | 139 const String& keyIdentifier, unsigned location, bool ctrlKey, bool altKey, b ool shiftKey, bool metaKey) |
|
Mike West
2015/01/29 11:49:34
Nit: Why reformat this?
Habib Virji
2015/01/29 12:24:14
Since it was more than 4 spaces, pre-submit was gi
| |
| 139 bool ctrlKey, bool altKey, bool shiftKey, bool metaKey) | |
| 140 { | 140 { |
| 141 if (dispatched()) | 141 if (dispatched()) |
| 142 return; | 142 return; |
| 143 | 143 |
| 144 initUIEvent(type, canBubble, cancelable, view, 0); | 144 initUIEvent(type, canBubble, cancelable, view, 0); |
| 145 | 145 |
| 146 m_keyIdentifier = keyIdentifier; | 146 m_keyIdentifier = keyIdentifier; |
| 147 m_location = location; | 147 m_location = location; |
| 148 m_ctrlKey = ctrlKey; | 148 m_ctrlKey = ctrlKey; |
| 149 m_shiftKey = shiftKey; | 149 m_shiftKey = shiftKey; |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 223 { | 223 { |
| 224 } | 224 } |
| 225 | 225 |
| 226 bool KeyboardEventDispatchMediator::dispatchEvent(EventDispatcher& dispatcher) c onst | 226 bool KeyboardEventDispatchMediator::dispatchEvent(EventDispatcher& dispatcher) c onst |
| 227 { | 227 { |
| 228 // Make sure not to return true if we already took default action while hand ling the event. | 228 // Make sure not to return true if we already took default action while hand ling the event. |
| 229 return EventDispatchMediator::dispatchEvent(dispatcher) && !event().defaultH andled(); | 229 return EventDispatchMediator::dispatchEvent(dispatcher) && !event().defaultH andled(); |
| 230 } | 230 } |
| 231 | 231 |
| 232 } // namespace blink | 232 } // namespace blink |
| OLD | NEW |