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

Side by Side Diff: content/browser/renderer_host/web_input_event_aurax11.cc

Issue 63253002: Rename WebKit namespace to blink (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
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 // Portions based heavily on: 5 // Portions based heavily on:
6 // third_party/WebKit/public/web/gtk/WebInputEventFactory.cpp 6 // third_party/WebKit/public/web/gtk/WebInputEventFactory.cpp
7 // 7 //
8 /* 8 /*
9 * Copyright (C) 2006-2011 Google Inc. All rights reserved. 9 * Copyright (C) 2006-2011 Google Inc. All rights reserved.
10 * 10 *
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 case XK_Meta_R: 82 case XK_Meta_R:
83 case XK_Alt_R: 83 case XK_Alt_R:
84 return ui::VKEY_RMENU; 84 return ui::VKEY_RMENU;
85 } 85 }
86 } 86 }
87 return windows_key_code; 87 return windows_key_code;
88 } 88 }
89 89
90 } // namespace 90 } // namespace
91 91
92 WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( 92 blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
93 ui::KeyEvent* event) { 93 ui::KeyEvent* event) {
94 base::NativeEvent native_event = event->native_event(); 94 base::NativeEvent native_event = event->native_event();
95 WebKit::WebKeyboardEvent webkit_event; 95 blink::WebKeyboardEvent webkit_event;
96 XKeyEvent* native_key_event = &native_event->xkey; 96 XKeyEvent* native_key_event = &native_event->xkey;
97 97
98 webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); 98 webkit_event.timeStampSeconds = event->time_stamp().InSecondsF();
99 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); 99 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags());
100 100
101 switch (native_event->type) { 101 switch (native_event->type) {
102 case KeyPress: 102 case KeyPress:
103 webkit_event.type = event->is_char() ? WebKit::WebInputEvent::Char : 103 webkit_event.type = event->is_char() ? blink::WebInputEvent::Char :
104 WebKit::WebInputEvent::RawKeyDown; 104 blink::WebInputEvent::RawKeyDown;
105 break; 105 break;
106 case KeyRelease: 106 case KeyRelease:
107 webkit_event.type = WebKit::WebInputEvent::KeyUp; 107 webkit_event.type = blink::WebInputEvent::KeyUp;
108 break; 108 break;
109 default: 109 default:
110 NOTREACHED(); 110 NOTREACHED();
111 } 111 }
112 112
113 if (webkit_event.modifiers & WebKit::WebInputEvent::AltKey) 113 if (webkit_event.modifiers & blink::WebInputEvent::AltKey)
114 webkit_event.isSystemKey = true; 114 webkit_event.isSystemKey = true;
115 115
116 webkit_event.windowsKeyCode = XKeyEventToWindowsKeyCode(native_key_event); 116 webkit_event.windowsKeyCode = XKeyEventToWindowsKeyCode(native_key_event);
117 webkit_event.nativeKeyCode = native_key_event->keycode; 117 webkit_event.nativeKeyCode = native_key_event->keycode;
118 118
119 if (webkit_event.windowsKeyCode == ui::VKEY_RETURN) 119 if (webkit_event.windowsKeyCode == ui::VKEY_RETURN)
120 webkit_event.unmodifiedText[0] = '\r'; 120 webkit_event.unmodifiedText[0] = '\r';
121 else 121 else
122 webkit_event.unmodifiedText[0] = ui::GetCharacterFromXEvent(native_event); 122 webkit_event.unmodifiedText[0] = ui::GetCharacterFromXEvent(native_event);
123 123
124 if (webkit_event.modifiers & WebKit::WebInputEvent::ControlKey) { 124 if (webkit_event.modifiers & blink::WebInputEvent::ControlKey) {
125 webkit_event.text[0] = 125 webkit_event.text[0] =
126 GetControlCharacter( 126 GetControlCharacter(
127 webkit_event.windowsKeyCode, 127 webkit_event.windowsKeyCode,
128 webkit_event.modifiers & WebKit::WebInputEvent::ShiftKey); 128 webkit_event.modifiers & blink::WebInputEvent::ShiftKey);
129 } else { 129 } else {
130 webkit_event.text[0] = webkit_event.unmodifiedText[0]; 130 webkit_event.text[0] = webkit_event.unmodifiedText[0];
131 } 131 }
132 132
133 webkit_event.setKeyIdentifierFromWindowsKeyCode(); 133 webkit_event.setKeyIdentifierFromWindowsKeyCode();
134 134
135 // TODO: IsAutoRepeat/IsKeyPad? 135 // TODO: IsAutoRepeat/IsKeyPad?
136 136
137 return webkit_event; 137 return webkit_event;
138 } 138 }
139 139
140 } // namespace content 140 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/web_input_event_aurawin.cc ('k') | content/browser/speech/input_tag_speech_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698