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

Side by Side Diff: webkit/plugins/ppapi/event_conversion.cc

Issue 7863003: Mouse lock implementation, including the renderer side and the Windows version of the browser side. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 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 | Annotate | Revision Log
« no previous file with comments | « ppapi/ppapi_tests.gypi ('k') | webkit/plugins/ppapi/mock_plugin_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "webkit/plugins/ppapi/event_conversion.h" 5 #include "webkit/plugins/ppapi/event_conversion.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/i18n/char_iterator.h" 8 #include "base/i18n/char_iterator.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 InputEventData result = GetEventWithCommonFieldsAndType(event); 128 InputEventData result = GetEventWithCommonFieldsAndType(event);
129 result.event_modifiers = mouse_event.modifiers; 129 result.event_modifiers = mouse_event.modifiers;
130 if (mouse_event.type == WebInputEvent::MouseDown || 130 if (mouse_event.type == WebInputEvent::MouseDown ||
131 mouse_event.type == WebInputEvent::MouseUp) { 131 mouse_event.type == WebInputEvent::MouseUp) {
132 result.mouse_button = 132 result.mouse_button =
133 static_cast<PP_InputEvent_MouseButton>(mouse_event.button); 133 static_cast<PP_InputEvent_MouseButton>(mouse_event.button);
134 } 134 }
135 result.mouse_position.x = mouse_event.x; 135 result.mouse_position.x = mouse_event.x;
136 result.mouse_position.y = mouse_event.y; 136 result.mouse_position.y = mouse_event.y;
137 result.mouse_click_count = mouse_event.clickCount; 137 result.mouse_click_count = mouse_event.clickCount;
138 138 result.mouse_movement.x = mouse_event.movementX;
139 // TODO(yzshen): Make the change after WebMouseEvent adds movementX/Y. 139 result.mouse_movement.y = mouse_event.movementY;
140 result.mouse_movement.x = 0; // mouse_event.movementX
141 result.mouse_movement.y = 0; // mouse_event.movementY
142 result_events->push_back(result); 140 result_events->push_back(result);
143 } 141 }
144 142
145 void AppendMouseWheelEvent(const WebInputEvent& event, 143 void AppendMouseWheelEvent(const WebInputEvent& event,
146 std::vector<InputEventData>* result_events) { 144 std::vector<InputEventData>* result_events) {
147 const WebMouseWheelEvent& mouse_wheel_event = 145 const WebMouseWheelEvent& mouse_wheel_event =
148 static_cast<const WebMouseWheelEvent&>(event); 146 static_cast<const WebMouseWheelEvent&>(event);
149 InputEventData result = GetEventWithCommonFieldsAndType(event); 147 InputEventData result = GetEventWithCommonFieldsAndType(event);
150 result.event_modifiers = mouse_wheel_event.modifiers; 148 result.event_modifiers = mouse_wheel_event.modifiers;
151 result.wheel_delta.x = mouse_wheel_event.deltaX; 149 result.wheel_delta.x = mouse_wheel_event.deltaX;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 NOTREACHED(); 220 NOTREACHED();
223 } 221 }
224 mouse_event->timeStampSeconds = 222 mouse_event->timeStampSeconds =
225 PPTimeTicksToEventTime(event.event_time_stamp); 223 PPTimeTicksToEventTime(event.event_time_stamp);
226 mouse_event->modifiers = event.event_modifiers; 224 mouse_event->modifiers = event.event_modifiers;
227 mouse_event->button = 225 mouse_event->button =
228 static_cast<WebMouseEvent::Button>(event.mouse_button); 226 static_cast<WebMouseEvent::Button>(event.mouse_button);
229 mouse_event->x = event.mouse_position.x; 227 mouse_event->x = event.mouse_position.x;
230 mouse_event->y = event.mouse_position.y; 228 mouse_event->y = event.mouse_position.y;
231 mouse_event->clickCount = event.mouse_click_count; 229 mouse_event->clickCount = event.mouse_click_count;
232 230 mouse_event->movementX = event.mouse_movement.x;
233 // TODO(yzshen): Uncomment the following lines after WebMouseEvent adds 231 mouse_event->movementY = event.mouse_movement.y;
234 // movementX/Y.
235 // mouse_event->movementX = event.mouse_position.x;
236 // mouse_event->movementY = event.mouse_position.y;
237 return mouse_event; 232 return mouse_event;
238 } 233 }
239 234
240 WebMouseWheelEvent* BuildMouseWheelEvent(const InputEventData& event) { 235 WebMouseWheelEvent* BuildMouseWheelEvent(const InputEventData& event) {
241 WebMouseWheelEvent* mouse_wheel_event = new WebMouseWheelEvent(); 236 WebMouseWheelEvent* mouse_wheel_event = new WebMouseWheelEvent();
242 mouse_wheel_event->type = WebInputEvent::MouseWheel; 237 mouse_wheel_event->type = WebInputEvent::MouseWheel;
243 mouse_wheel_event->timeStampSeconds = 238 mouse_wheel_event->timeStampSeconds =
244 PPTimeTicksToEventTime(event.event_time_stamp); 239 PPTimeTicksToEventTime(event.event_time_stamp);
245 mouse_wheel_event->modifiers = event.event_modifiers; 240 mouse_wheel_event->modifiers = event.event_modifiers;
246 mouse_wheel_event->deltaX = event.wheel_delta.x; 241 mouse_wheel_event->deltaX = event.wheel_delta.x;
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 return PP_INPUTEVENT_CLASS_KEYBOARD; 333 return PP_INPUTEVENT_CLASS_KEYBOARD;
339 case WebInputEvent::Undefined: 334 case WebInputEvent::Undefined:
340 default: 335 default:
341 NOTREACHED(); 336 NOTREACHED();
342 return PP_InputEvent_Class(0); 337 return PP_InputEvent_Class(0);
343 } 338 }
344 } 339 }
345 340
346 } // namespace ppapi 341 } // namespace ppapi
347 } // namespace webkit 342 } // namespace webkit
OLDNEW
« no previous file with comments | « ppapi/ppapi_tests.gypi ('k') | webkit/plugins/ppapi/mock_plugin_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698