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

Side by Side Diff: Source/core/platform/chromium/PlatformKeyboardEventChromium.cpp

Issue 14107015: Rename OS(DARWIN) to OS(MACOSX). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 years, 3 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) 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Google Inc. 3 * Copyright (C) 2008, 2009 Google Inc.
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 11 matching lines...) Expand all
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "config.h" 27 #include "config.h"
28 #include "core/platform/PlatformKeyboardEvent.h" 28 #include "core/platform/PlatformKeyboardEvent.h"
29 29
30 #if OS(WINDOWS) 30 #if OS(WINDOWS)
31 #include <windows.h> 31 #include <windows.h>
32 #elif OS(DARWIN) 32 #elif OS(MACOSX)
33 #import <Carbon/Carbon.h> 33 #import <Carbon/Carbon.h>
34 #else 34 #else
35 #include "core/platform/NotImplemented.h" 35 #include "core/platform/NotImplemented.h"
36 #endif 36 #endif
37 37
38 namespace WebCore { 38 namespace WebCore {
39 39
40 #if OS(WINDOWS) 40 #if OS(WINDOWS)
41 static const unsigned short HIGH_BIT_MASK_SHORT = 0x8000; 41 static const unsigned short HIGH_BIT_MASK_SHORT = 0x8000;
42 #endif 42 #endif
43 43
44 void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type) 44 void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type)
45 { 45 {
46 #if OS(WINDOWS) 46 #if OS(WINDOWS)
47 // No KeyDown events on Windows to disambiguate. 47 // No KeyDown events on Windows to disambiguate.
48 ASSERT_NOT_REACHED(); 48 ASSERT_NOT_REACHED();
49 #else 49 #else
50 // Can only change type from KeyDown to RawKeyDown or Char, as we lack infor mation for other conversions. 50 // Can only change type from KeyDown to RawKeyDown or Char, as we lack infor mation for other conversions.
51 ASSERT(m_type == PlatformEvent::KeyDown); 51 ASSERT(m_type == PlatformEvent::KeyDown);
52 ASSERT(type == PlatformEvent::RawKeyDown || type == PlatformEvent::Char); 52 ASSERT(type == PlatformEvent::RawKeyDown || type == PlatformEvent::Char);
53 m_type = type; 53 m_type = type;
54 54
55 if (type == RawKeyDown) { 55 if (type == RawKeyDown) {
56 m_text = String(); 56 m_text = String();
57 m_unmodifiedText = String(); 57 m_unmodifiedText = String();
58 } else { 58 } else {
59 m_keyIdentifier = String(); 59 m_keyIdentifier = String();
60 m_windowsVirtualKeyCode = 0; 60 m_windowsVirtualKeyCode = 0;
61 #if OS(DARWIN) 61 #if OS(MACOSX)
62 if (m_text.length() == 1 && (m_text[0U] >= 0xF700 && m_text[0U] <= 0xF7F F)) { 62 if (m_text.length() == 1 && (m_text[0U] >= 0xF700 && m_text[0U] <= 0xF7F F)) {
63 // According to NSEvents.h, OpenStep reserves the range 0xF700-0xF8F F for function keys. However, some actual private use characters 63 // According to NSEvents.h, OpenStep reserves the range 0xF700-0xF8F F for function keys. However, some actual private use characters
64 // happen to be in this range, e.g. the Apple logo (Option+Shift+K). 64 // happen to be in this range, e.g. the Apple logo (Option+Shift+K).
65 // 0xF7FF is an arbitrary cut-off. 65 // 0xF7FF is an arbitrary cut-off.
66 m_text = String(); 66 m_text = String();
67 m_unmodifiedText = String(); 67 m_unmodifiedText = String();
68 } 68 }
69 #endif 69 #endif
70 } 70 }
71 #endif 71 #endif
72 } 72 }
73 73
74 bool PlatformKeyboardEvent::currentCapsLockState() 74 bool PlatformKeyboardEvent::currentCapsLockState()
75 { 75 {
76 #if OS(WINDOWS) 76 #if OS(WINDOWS)
77 // FIXME: Does this even work inside the sandbox? 77 // FIXME: Does this even work inside the sandbox?
78 return GetKeyState(VK_CAPITAL) & 1; 78 return GetKeyState(VK_CAPITAL) & 1;
79 #elif OS(DARWIN) 79 #elif OS(MACOSX)
80 return GetCurrentKeyModifiers() & alphaLock; 80 return GetCurrentKeyModifiers() & alphaLock;
81 #else 81 #else
82 notImplemented(); 82 notImplemented();
83 return false; 83 return false;
84 #endif 84 #endif
85 } 85 }
86 86
87 void PlatformKeyboardEvent::getCurrentModifierState(bool& shiftKey, bool& ctrlKe y, bool& altKey, bool& metaKey) 87 void PlatformKeyboardEvent::getCurrentModifierState(bool& shiftKey, bool& ctrlKe y, bool& altKey, bool& metaKey)
88 { 88 {
89 #if OS(WINDOWS) 89 #if OS(WINDOWS)
90 shiftKey = GetKeyState(VK_SHIFT) & HIGH_BIT_MASK_SHORT; 90 shiftKey = GetKeyState(VK_SHIFT) & HIGH_BIT_MASK_SHORT;
91 ctrlKey = GetKeyState(VK_CONTROL) & HIGH_BIT_MASK_SHORT; 91 ctrlKey = GetKeyState(VK_CONTROL) & HIGH_BIT_MASK_SHORT;
92 altKey = GetKeyState(VK_MENU) & HIGH_BIT_MASK_SHORT; 92 altKey = GetKeyState(VK_MENU) & HIGH_BIT_MASK_SHORT;
93 metaKey = false; 93 metaKey = false;
94 #elif OS(DARWIN) 94 #elif OS(MACOSX)
95 UInt32 currentModifiers = GetCurrentKeyModifiers(); 95 UInt32 currentModifiers = GetCurrentKeyModifiers();
96 shiftKey = currentModifiers & ::shiftKey; 96 shiftKey = currentModifiers & ::shiftKey;
97 ctrlKey = currentModifiers & ::controlKey; 97 ctrlKey = currentModifiers & ::controlKey;
98 altKey = currentModifiers & ::optionKey; 98 altKey = currentModifiers & ::optionKey;
99 metaKey = currentModifiers & ::cmdKey; 99 metaKey = currentModifiers & ::cmdKey;
100 #else 100 #else
101 shiftKey = false; 101 shiftKey = false;
102 ctrlKey = false; 102 ctrlKey = false;
103 altKey = false; 103 altKey = false;
104 metaKey = false; 104 metaKey = false;
105 notImplemented(); 105 notImplemented();
106 #endif 106 #endif
107 } 107 }
108 108
109 } // namespace WebCore 109 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/platform/audio/mac/FFTFrameMac.cpp ('k') | Source/core/platform/graphics/FloatPoint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698