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

Side by Side Diff: third_party/WebKit/Source/platform/PlatformKeyboardEvent.cpp

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-13-platform: . Created 4 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
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 25 matching lines...) Expand all
36 36
37 namespace blink { 37 namespace blink {
38 38
39 #if OS(WIN) 39 #if OS(WIN)
40 static const unsigned short HIGHBITMASKSHORT = 0x8000; 40 static const unsigned short HIGHBITMASKSHORT = 0x8000;
41 #endif 41 #endif
42 42
43 PlatformKeyboardEvent::OverrideCapsLockState PlatformKeyboardEvent::s_overrideCa psLockState = 43 PlatformKeyboardEvent::OverrideCapsLockState PlatformKeyboardEvent::s_overrideCa psLockState =
44 PlatformKeyboardEvent::OverrideCapsLockState::Default; 44 PlatformKeyboardEvent::OverrideCapsLockState::Default;
45 45
46 void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type) 46 void PlatformKeyboardEvent::disambiguateKeyDownEvent(EventType type)
47 { 47 {
48 #if OS(WIN) 48 #if OS(WIN)
49 // No KeyDown events on Windows to disambiguate. 49 // No KeyDown events on Windows to disambiguate.
50 ASSERT_NOT_REACHED(); 50 ASSERT_NOT_REACHED();
51 #else 51 #else
52 // Can only change type from KeyDown to RawKeyDown or Char, as we lack infor mation for other conversions. 52 // Can only change type from KeyDown to RawKeyDown or Char, as we lack infor mation for other conversions.
53 ASSERT(m_type == PlatformEvent::KeyDown); 53 ASSERT(m_type == PlatformEvent::KeyDown);
54 ASSERT(type == PlatformEvent::RawKeyDown || type == PlatformEvent::Char); 54 ASSERT(type == PlatformEvent::RawKeyDown || type == PlatformEvent::Char);
55 m_type = type; 55 m_type = type;
56 56
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 if (currentModifiers & ::cmdKey) 115 if (currentModifiers & ::cmdKey)
116 modifiers |= MetaKey; 116 modifiers |= MetaKey;
117 #else 117 #else
118 // See https://crbug.com/538289 118 // See https://crbug.com/538289
119 notImplemented(); 119 notImplemented();
120 #endif 120 #endif
121 return static_cast<Modifiers>(modifiers); 121 return static_cast<Modifiers>(modifiers);
122 } 122 }
123 123
124 } // namespace blink 124 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/PlatformKeyboardEvent.h ('k') | third_party/WebKit/Source/platform/PlatformMouseEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698