Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. |
| 3 * Copyright (C) 2008 Collabora, Ltd. All rights reserved. | 3 * Copyright (C) 2008 Collabora, Ltd. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 44 , m_isKeypad(false) | 44 , m_isKeypad(false) |
| 45 , m_isSystemKey(false) | 45 , m_isSystemKey(false) |
| 46 { | 46 { |
| 47 } | 47 } |
| 48 | 48 |
| 49 PlatformKeyboardEvent(Type type, const String& text, const String& unmodifie dText, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtual KeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, Modifiers modifiers , double timestamp) | 49 PlatformKeyboardEvent(Type type, const String& text, const String& unmodifie dText, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtual KeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, Modifiers modifiers , double timestamp) |
| 50 : PlatformEvent(type, modifiers, timestamp) | 50 : PlatformEvent(type, modifiers, timestamp) |
| 51 , m_text(text) | 51 , m_text(text) |
| 52 , m_unmodifiedText(unmodifiedText) | 52 , m_unmodifiedText(unmodifiedText) |
| 53 , m_keyIdentifier(keyIdentifier) | 53 , m_keyIdentifier(keyIdentifier) |
| 54 , m_code("") | |
|
Wez
2014/11/20 22:17:33
Why are you not adding |code| to the constructor s
Habib Virji
2014/11/24 15:12:22
Since the constructor is used by inspector, there
| |
| 54 , m_windowsVirtualKeyCode(windowsVirtualKeyCode) | 55 , m_windowsVirtualKeyCode(windowsVirtualKeyCode) |
| 55 , m_nativeVirtualKeyCode(nativeVirtualKeyCode) | 56 , m_nativeVirtualKeyCode(nativeVirtualKeyCode) |
| 56 , m_autoRepeat(isAutoRepeat) | 57 , m_autoRepeat(isAutoRepeat) |
| 57 , m_isKeypad(isKeypad) | 58 , m_isKeypad(isKeypad) |
| 58 , m_isSystemKey(isSystemKey) | 59 , m_isSystemKey(isSystemKey) |
| 59 { | 60 { |
| 60 } | 61 } |
| 61 | 62 |
| 62 PLATFORM_EXPORT void disambiguateKeyDownEvent(Type); | 63 PLATFORM_EXPORT void disambiguateKeyDownEvent(Type); |
| 63 | 64 |
| 64 // Text as as generated by processing a virtual key code with a keyboard lay out | 65 // Text as as generated by processing a virtual key code with a keyboard lay out |
| 65 // (in most cases, just a character code, but the layout can emit several | 66 // (in most cases, just a character code, but the layout can emit several |
| 66 // characters in a single keypress event on some platforms). | 67 // characters in a single keypress event on some platforms). |
| 67 // This may bear no resemblance to the ultimately inserted text if an input method | 68 // This may bear no resemblance to the ultimately inserted text if an input method |
| 68 // processes the input. | 69 // processes the input. |
| 69 // Will be null for KeyUp and RawKeyDown events. | 70 // Will be null for KeyUp and RawKeyDown events. |
| 70 String text() const { return m_text; } | 71 String text() const { return m_text; } |
| 71 | 72 |
| 72 // Text that would have been generated by the keyboard if no modifiers were pressed | 73 // Text that would have been generated by the keyboard if no modifiers were pressed |
| 73 // (except for Shift); useful for shortcut (accelerator) key handling. | 74 // (except for Shift); useful for shortcut (accelerator) key handling. |
| 74 // Otherwise, same as text(). | 75 // Otherwise, same as text(). |
| 75 String unmodifiedText() const { return m_unmodifiedText; } | 76 String unmodifiedText() const { return m_unmodifiedText; } |
| 76 | 77 |
| 77 String keyIdentifier() const { return m_keyIdentifier; } | 78 String keyIdentifier() const { return m_keyIdentifier; } |
| 78 | 79 |
| 80 String code() const { return m_code; } | |
| 81 | |
| 79 // Most compatible Windows virtual key code associated with the event. | 82 // Most compatible Windows virtual key code associated with the event. |
| 80 // Zero for Char events. | 83 // Zero for Char events. |
| 81 int windowsVirtualKeyCode() const { return m_windowsVirtualKeyCode; } | 84 int windowsVirtualKeyCode() const { return m_windowsVirtualKeyCode; } |
| 82 | 85 |
| 83 int nativeVirtualKeyCode() const { return m_nativeVirtualKeyCode; } | 86 int nativeVirtualKeyCode() const { return m_nativeVirtualKeyCode; } |
| 84 | 87 |
| 85 bool isAutoRepeat() const { return m_autoRepeat; } | 88 bool isAutoRepeat() const { return m_autoRepeat; } |
| 86 bool isKeypad() const { return m_isKeypad; } | 89 bool isKeypad() const { return m_isKeypad; } |
| 87 bool isSystemKey() const { return m_isSystemKey; } | 90 bool isSystemKey() const { return m_isSystemKey; } |
| 88 | 91 |
| 89 PLATFORM_EXPORT static bool currentCapsLockState(); | 92 PLATFORM_EXPORT static bool currentCapsLockState(); |
| 90 PLATFORM_EXPORT static void getCurrentModifierState(bool& shiftKey, bool& ct rlKey, bool& altKey, bool& metaKey); | 93 PLATFORM_EXPORT static void getCurrentModifierState(bool& shiftKey, bool& ct rlKey, bool& altKey, bool& metaKey); |
| 91 | 94 |
| 92 protected: | 95 protected: |
| 93 String m_text; | 96 String m_text; |
| 94 String m_unmodifiedText; | 97 String m_unmodifiedText; |
| 95 String m_keyIdentifier; | 98 String m_keyIdentifier; |
| 99 String m_code; | |
| 96 int m_windowsVirtualKeyCode; | 100 int m_windowsVirtualKeyCode; |
| 97 int m_nativeVirtualKeyCode; | 101 int m_nativeVirtualKeyCode; |
| 98 bool m_autoRepeat; | 102 bool m_autoRepeat; |
| 99 bool m_isKeypad; | 103 bool m_isKeypad; |
| 100 bool m_isSystemKey; | 104 bool m_isSystemKey; |
| 101 }; | 105 }; |
| 102 | 106 |
| 103 } // namespace blink | 107 } // namespace blink |
| 104 | 108 |
| 105 #endif // PlatformKeyboardEvent_h | 109 #endif // PlatformKeyboardEvent_h |
| OLD | NEW |