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

Side by Side Diff: ui/events/event.cc

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed bot failure: cast_shell_linux Created 5 years, 6 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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/events/event.h" 5 #include "ui/events/event.h"
6 6
7 #if defined(USE_X11) 7 #if defined(USE_X11)
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/keysym.h> 9 #include <X11/keysym.h>
10 #include <X11/Xlib.h> 10 #include <X11/Xlib.h>
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 CASE_TYPE(ET_MOUSE_EXITED); 49 CASE_TYPE(ET_MOUSE_EXITED);
50 CASE_TYPE(ET_KEY_PRESSED); 50 CASE_TYPE(ET_KEY_PRESSED);
51 CASE_TYPE(ET_KEY_RELEASED); 51 CASE_TYPE(ET_KEY_RELEASED);
52 CASE_TYPE(ET_MOUSEWHEEL); 52 CASE_TYPE(ET_MOUSEWHEEL);
53 CASE_TYPE(ET_MOUSE_CAPTURE_CHANGED); 53 CASE_TYPE(ET_MOUSE_CAPTURE_CHANGED);
54 CASE_TYPE(ET_TOUCH_RELEASED); 54 CASE_TYPE(ET_TOUCH_RELEASED);
55 CASE_TYPE(ET_TOUCH_PRESSED); 55 CASE_TYPE(ET_TOUCH_PRESSED);
56 CASE_TYPE(ET_TOUCH_MOVED); 56 CASE_TYPE(ET_TOUCH_MOVED);
57 CASE_TYPE(ET_TOUCH_CANCELLED); 57 CASE_TYPE(ET_TOUCH_CANCELLED);
58 CASE_TYPE(ET_DROP_TARGET_EVENT); 58 CASE_TYPE(ET_DROP_TARGET_EVENT);
59 CASE_TYPE(ET_TRANSLATED_KEY_PRESS);
60 CASE_TYPE(ET_TRANSLATED_KEY_RELEASE);
61 CASE_TYPE(ET_GESTURE_SCROLL_BEGIN); 59 CASE_TYPE(ET_GESTURE_SCROLL_BEGIN);
62 CASE_TYPE(ET_GESTURE_SCROLL_END); 60 CASE_TYPE(ET_GESTURE_SCROLL_END);
63 CASE_TYPE(ET_GESTURE_SCROLL_UPDATE); 61 CASE_TYPE(ET_GESTURE_SCROLL_UPDATE);
64 CASE_TYPE(ET_GESTURE_SHOW_PRESS); 62 CASE_TYPE(ET_GESTURE_SHOW_PRESS);
65 CASE_TYPE(ET_GESTURE_WIN8_EDGE_SWIPE); 63 CASE_TYPE(ET_GESTURE_WIN8_EDGE_SWIPE);
66 CASE_TYPE(ET_GESTURE_TAP); 64 CASE_TYPE(ET_GESTURE_TAP);
67 CASE_TYPE(ET_GESTURE_TAP_DOWN); 65 CASE_TYPE(ET_GESTURE_TAP_DOWN);
68 CASE_TYPE(ET_GESTURE_TAP_CANCEL); 66 CASE_TYPE(ET_GESTURE_TAP_CANCEL);
69 CASE_TYPE(ET_GESTURE_BEGIN); 67 CASE_TYPE(ET_GESTURE_BEGIN);
70 CASE_TYPE(ET_GESTURE_END); 68 CASE_TYPE(ET_GESTURE_END);
(...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 break; 892 break;
895 default: 893 default:
896 return; 894 return;
897 } 895 }
898 if (type() == ET_KEY_PRESSED) 896 if (type() == ET_KEY_PRESSED)
899 set_flags(flags() | mask); 897 set_flags(flags() | mask);
900 else 898 else
901 set_flags(flags() & ~mask); 899 set_flags(flags() & ~mask);
902 } 900 }
903 901
904 bool KeyEvent::IsTranslated() const {
905 switch (type()) {
906 case ET_KEY_PRESSED:
907 case ET_KEY_RELEASED:
908 return false;
909 case ET_TRANSLATED_KEY_PRESS:
910 case ET_TRANSLATED_KEY_RELEASE:
911 return true;
912 default:
913 NOTREACHED();
914 return false;
915 }
916 }
917
918 void KeyEvent::SetTranslated(bool translated) {
919 switch (type()) {
920 case ET_KEY_PRESSED:
921 case ET_TRANSLATED_KEY_PRESS:
922 SetType(translated ? ET_TRANSLATED_KEY_PRESS : ET_KEY_PRESSED);
923 break;
924 case ET_KEY_RELEASED:
925 case ET_TRANSLATED_KEY_RELEASE:
926 SetType(translated ? ET_TRANSLATED_KEY_RELEASE : ET_KEY_RELEASED);
927 break;
928 default:
929 NOTREACHED();
930 }
931 }
932
933 KeyboardCode KeyEvent::GetLocatedWindowsKeyboardCode() const { 902 KeyboardCode KeyEvent::GetLocatedWindowsKeyboardCode() const {
934 return NonLocatedToLocatedKeyboardCode(key_code_, code_); 903 return NonLocatedToLocatedKeyboardCode(key_code_, code_);
935 } 904 }
936 905
937 uint16 KeyEvent::GetConflatedWindowsKeyCode() const { 906 uint16 KeyEvent::GetConflatedWindowsKeyCode() const {
938 if (is_char_) 907 if (is_char_)
939 return character_; 908 return character_;
940 return key_code_; 909 return key_code_;
941 } 910 }
942 911
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
1004 gfx::PointF(x, y), 973 gfx::PointF(x, y),
1005 time_stamp, 974 time_stamp,
1006 flags | EF_FROM_TOUCH), 975 flags | EF_FROM_TOUCH),
1007 details_(details) { 976 details_(details) {
1008 } 977 }
1009 978
1010 GestureEvent::~GestureEvent() { 979 GestureEvent::~GestureEvent() {
1011 } 980 }
1012 981
1013 } // namespace ui 982 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698