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

Side by Side Diff: ppapi/thunk/ppb_input_event_thunk.cc

Issue 238923007: PPAPI: Format ppapi/thunk using clang-format. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use Popen instead, force carriage returns in thunks Created 6 years, 8 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
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 "ppapi/c/pp_errors.h" 5 #include "ppapi/c/pp_errors.h"
6 #include "ppapi/thunk/enter.h" 6 #include "ppapi/thunk/enter.h"
7 #include "ppapi/thunk/ppb_input_event_api.h" 7 #include "ppapi/thunk/ppb_input_event_api.h"
8 #include "ppapi/thunk/ppb_instance_api.h" 8 #include "ppapi/thunk/ppb_instance_api.h"
9 #include "ppapi/thunk/resource_creation_api.h" 9 #include "ppapi/thunk/resource_creation_api.h"
10 #include "ppapi/thunk/thunk.h" 10 #include "ppapi/thunk/thunk.h"
(...skipping 18 matching lines...) Expand all
29 int32_t RequestFilteringInputEvents(PP_Instance instance, 29 int32_t RequestFilteringInputEvents(PP_Instance instance,
30 uint32_t event_classes) { 30 uint32_t event_classes) {
31 VLOG(4) << "PPB_InputEvent::RequestFilteringInputEvents()"; 31 VLOG(4) << "PPB_InputEvent::RequestFilteringInputEvents()";
32 EnterInstance enter(instance); 32 EnterInstance enter(instance);
33 if (enter.failed()) 33 if (enter.failed())
34 return enter.retval(); 34 return enter.retval();
35 return enter.functions()->RequestFilteringInputEvents(instance, 35 return enter.functions()->RequestFilteringInputEvents(instance,
36 event_classes); 36 event_classes);
37 } 37 }
38 38
39 void ClearInputEventRequest(PP_Instance instance, 39 void ClearInputEventRequest(PP_Instance instance, uint32_t event_classes) {
40 uint32_t event_classes) {
41 VLOG(4) << "PPB_InputEvent::ClearInputEventRequest()"; 40 VLOG(4) << "PPB_InputEvent::ClearInputEventRequest()";
42 EnterInstance enter(instance); 41 EnterInstance enter(instance);
43 if (enter.succeeded()) 42 if (enter.succeeded())
44 enter.functions()->ClearInputEventRequest(instance, event_classes); 43 enter.functions()->ClearInputEventRequest(instance, event_classes);
45 } 44 }
46 45
47 PP_Bool IsInputEvent(PP_Resource resource) { 46 PP_Bool IsInputEvent(PP_Resource resource) {
48 VLOG(4) << "PPB_InputEvent::IsInputEvent()"; 47 VLOG(4) << "PPB_InputEvent::IsInputEvent()";
49 EnterInputEvent enter(resource, false); 48 EnterInputEvent enter(resource, false);
50 return enter.succeeded() ? PP_TRUE : PP_FALSE; 49 return enter.succeeded() ? PP_TRUE : PP_FALSE;
(...skipping 17 matching lines...) Expand all
68 67
69 uint32_t GetModifiers(PP_Resource event) { 68 uint32_t GetModifiers(PP_Resource event) {
70 VLOG(4) << "PPB_InputEvent::GetModifiers()"; 69 VLOG(4) << "PPB_InputEvent::GetModifiers()";
71 EnterInputEvent enter(event, true); 70 EnterInputEvent enter(event, true);
72 if (enter.failed()) 71 if (enter.failed())
73 return 0; 72 return 0;
74 return enter.object()->GetModifiers(); 73 return enter.object()->GetModifiers();
75 } 74 }
76 75
77 const PPB_InputEvent g_ppb_input_event_thunk = { 76 const PPB_InputEvent g_ppb_input_event_thunk = {
78 &RequestInputEvents, 77 &RequestInputEvents, &RequestFilteringInputEvents, &ClearInputEventRequest,
79 &RequestFilteringInputEvents, 78 &IsInputEvent, &GetType, &GetTimeStamp,
80 &ClearInputEventRequest, 79 &GetModifiers};
81 &IsInputEvent,
82 &GetType,
83 &GetTimeStamp,
84 &GetModifiers
85 };
86 80
87 // Mouse ----------------------------------------------------------------------- 81 // Mouse -----------------------------------------------------------------------
88 82
89 PP_Resource CreateMouseInputEvent1_0(PP_Instance instance, 83 PP_Resource CreateMouseInputEvent1_0(PP_Instance instance,
90 PP_InputEvent_Type type, 84 PP_InputEvent_Type type,
91 PP_TimeTicks time_stamp, 85 PP_TimeTicks time_stamp,
92 uint32_t modifiers, 86 uint32_t modifiers,
93 PP_InputEvent_MouseButton mouse_button, 87 PP_InputEvent_MouseButton mouse_button,
94 const PP_Point* mouse_position, 88 const PP_Point* mouse_position,
95 int32_t click_count) { 89 int32_t click_count) {
96 VLOG(4) << "PPB_MouseInputEvent::Create()"; 90 VLOG(4) << "PPB_MouseInputEvent::Create()";
97 EnterResourceCreation enter(instance); 91 EnterResourceCreation enter(instance);
98 if (enter.failed()) 92 if (enter.failed())
99 return 0; 93 return 0;
100 94
101 PP_Point mouse_movement = PP_MakePoint(0, 0); 95 PP_Point mouse_movement = PP_MakePoint(0, 0);
102 return enter.functions()->CreateMouseInputEvent(instance, type, time_stamp, 96 return enter.functions()->CreateMouseInputEvent(instance,
103 modifiers, mouse_button, 97 type,
104 mouse_position, click_count, 98 time_stamp,
99 modifiers,
100 mouse_button,
101 mouse_position,
102 click_count,
105 &mouse_movement); 103 &mouse_movement);
106 } 104 }
107 105
108 PP_Resource CreateMouseInputEvent1_1(PP_Instance instance, 106 PP_Resource CreateMouseInputEvent1_1(PP_Instance instance,
109 PP_InputEvent_Type type, 107 PP_InputEvent_Type type,
110 PP_TimeTicks time_stamp, 108 PP_TimeTicks time_stamp,
111 uint32_t modifiers, 109 uint32_t modifiers,
112 PP_InputEvent_MouseButton mouse_button, 110 PP_InputEvent_MouseButton mouse_button,
113 const PP_Point* mouse_position, 111 const PP_Point* mouse_position,
114 int32_t click_count, 112 int32_t click_count,
115 const PP_Point* mouse_movement) { 113 const PP_Point* mouse_movement) {
116 VLOG(4) << "PPB_MouseInputEvent::Create()"; 114 VLOG(4) << "PPB_MouseInputEvent::Create()";
117 EnterResourceCreation enter(instance); 115 EnterResourceCreation enter(instance);
118 if (enter.failed()) 116 if (enter.failed())
119 return 0; 117 return 0;
120 return enter.functions()->CreateMouseInputEvent(instance, type, time_stamp, 118 return enter.functions()->CreateMouseInputEvent(instance,
121 modifiers, mouse_button, 119 type,
122 mouse_position, click_count, 120 time_stamp,
121 modifiers,
122 mouse_button,
123 mouse_position,
124 click_count,
123 mouse_movement); 125 mouse_movement);
124 } 126 }
125 127
126 PP_Bool IsMouseInputEvent(PP_Resource resource) { 128 PP_Bool IsMouseInputEvent(PP_Resource resource) {
127 VLOG(4) << "PPB_MouseInputEvent::IsMouseInputEvent()"; 129 VLOG(4) << "PPB_MouseInputEvent::IsMouseInputEvent()";
128 if (!IsInputEvent(resource)) 130 if (!IsInputEvent(resource))
129 return PP_FALSE; // Prevent warning log in GetType. 131 return PP_FALSE; // Prevent warning log in GetType.
130 PP_InputEvent_Type type = GetType(resource); 132 PP_InputEvent_Type type = GetType(resource);
131 return PP_FromBool(type == PP_INPUTEVENT_TYPE_MOUSEDOWN || 133 return PP_FromBool(type == PP_INPUTEVENT_TYPE_MOUSEDOWN ||
132 type == PP_INPUTEVENT_TYPE_MOUSEUP || 134 type == PP_INPUTEVENT_TYPE_MOUSEUP ||
(...skipping 29 matching lines...) Expand all
162 164
163 PP_Point GetMouseMovement(PP_Resource mouse_event) { 165 PP_Point GetMouseMovement(PP_Resource mouse_event) {
164 VLOG(4) << "PPB_MouseInputEvent::GetMovement()"; 166 VLOG(4) << "PPB_MouseInputEvent::GetMovement()";
165 EnterInputEvent enter(mouse_event, true); 167 EnterInputEvent enter(mouse_event, true);
166 if (enter.failed()) 168 if (enter.failed())
167 return PP_MakePoint(0, 0); 169 return PP_MakePoint(0, 0);
168 return enter.object()->GetMouseMovement(); 170 return enter.object()->GetMouseMovement();
169 } 171 }
170 172
171 const PPB_MouseInputEvent_1_0 g_ppb_mouse_input_event_1_0_thunk = { 173 const PPB_MouseInputEvent_1_0 g_ppb_mouse_input_event_1_0_thunk = {
172 &CreateMouseInputEvent1_0, 174 &CreateMouseInputEvent1_0, &IsMouseInputEvent, &GetMouseButton,
173 &IsMouseInputEvent, 175 &GetMousePosition, &GetMouseClickCount};
174 &GetMouseButton,
175 &GetMousePosition,
176 &GetMouseClickCount
177 };
178 176
179 const PPB_MouseInputEvent g_ppb_mouse_input_event_1_1_thunk = { 177 const PPB_MouseInputEvent g_ppb_mouse_input_event_1_1_thunk = {
180 &CreateMouseInputEvent1_1, 178 &CreateMouseInputEvent1_1, &IsMouseInputEvent, &GetMouseButton,
181 &IsMouseInputEvent, 179 &GetMousePosition, &GetMouseClickCount, &GetMouseMovement};
182 &GetMouseButton,
183 &GetMousePosition,
184 &GetMouseClickCount,
185 &GetMouseMovement
186 };
187 180
188 // Wheel ----------------------------------------------------------------------- 181 // Wheel -----------------------------------------------------------------------
189 182
190 PP_Resource CreateWheelInputEvent(PP_Instance instance, 183 PP_Resource CreateWheelInputEvent(PP_Instance instance,
191 PP_TimeTicks time_stamp, 184 PP_TimeTicks time_stamp,
192 uint32_t modifiers, 185 uint32_t modifiers,
193 const PP_FloatPoint* wheel_delta, 186 const PP_FloatPoint* wheel_delta,
194 const PP_FloatPoint* wheel_ticks, 187 const PP_FloatPoint* wheel_ticks,
195 PP_Bool scroll_by_page) { 188 PP_Bool scroll_by_page) {
196 VLOG(4) << "PPB_WheelInputEvent::Create()"; 189 VLOG(4) << "PPB_WheelInputEvent::Create()";
197 EnterResourceCreation enter(instance); 190 EnterResourceCreation enter(instance);
198 if (enter.failed()) 191 if (enter.failed())
199 return 0; 192 return 0;
200 return enter.functions()->CreateWheelInputEvent(instance, time_stamp, 193 return enter.functions()->CreateWheelInputEvent(instance,
201 modifiers, wheel_delta, 194 time_stamp,
202 wheel_ticks, scroll_by_page); 195 modifiers,
196 wheel_delta,
197 wheel_ticks,
198 scroll_by_page);
203 } 199 }
204 200
205 PP_Bool IsWheelInputEvent(PP_Resource resource) { 201 PP_Bool IsWheelInputEvent(PP_Resource resource) {
206 VLOG(4) << "PPB_WheelInputEvent::IsWheelInputEvent()"; 202 VLOG(4) << "PPB_WheelInputEvent::IsWheelInputEvent()";
207 if (!IsInputEvent(resource)) 203 if (!IsInputEvent(resource))
208 return PP_FALSE; // Prevent warning log in GetType. 204 return PP_FALSE; // Prevent warning log in GetType.
209 PP_InputEvent_Type type = GetType(resource); 205 PP_InputEvent_Type type = GetType(resource);
210 return PP_FromBool(type == PP_INPUTEVENT_TYPE_WHEEL); 206 return PP_FromBool(type == PP_INPUTEVENT_TYPE_WHEEL);
211 } 207 }
212 208
(...skipping 15 matching lines...) Expand all
228 224
229 PP_Bool GetWheelScrollByPage(PP_Resource wheel_event) { 225 PP_Bool GetWheelScrollByPage(PP_Resource wheel_event) {
230 VLOG(4) << "PPB_WheelInputEvent::GetScrollByPage()"; 226 VLOG(4) << "PPB_WheelInputEvent::GetScrollByPage()";
231 EnterInputEvent enter(wheel_event, true); 227 EnterInputEvent enter(wheel_event, true);
232 if (enter.failed()) 228 if (enter.failed())
233 return PP_FALSE; 229 return PP_FALSE;
234 return enter.object()->GetWheelScrollByPage(); 230 return enter.object()->GetWheelScrollByPage();
235 } 231 }
236 232
237 const PPB_WheelInputEvent g_ppb_wheel_input_event_thunk = { 233 const PPB_WheelInputEvent g_ppb_wheel_input_event_thunk = {
238 &CreateWheelInputEvent, 234 &CreateWheelInputEvent, &IsWheelInputEvent, &GetWheelDelta, &GetWheelTicks,
239 &IsWheelInputEvent, 235 &GetWheelScrollByPage};
240 &GetWheelDelta,
241 &GetWheelTicks,
242 &GetWheelScrollByPage
243 };
244 236
245 // Keyboard -------------------------------------------------------------------- 237 // Keyboard --------------------------------------------------------------------
246 238
247 PP_Resource CreateKeyboardInputEvent_1_0(PP_Instance instance, 239 PP_Resource CreateKeyboardInputEvent_1_0(PP_Instance instance,
248 PP_InputEvent_Type type, 240 PP_InputEvent_Type type,
249 PP_TimeTicks time_stamp, 241 PP_TimeTicks time_stamp,
250 uint32_t modifiers, 242 uint32_t modifiers,
251 uint32_t key_code, 243 uint32_t key_code,
252 struct PP_Var character_text) { 244 struct PP_Var character_text) {
253 VLOG(4) << "PPB_KeyboardInputEvent::Create()"; 245 VLOG(4) << "PPB_KeyboardInputEvent::Create()";
254 EnterResourceCreation enter(instance); 246 EnterResourceCreation enter(instance);
255 if (enter.failed()) 247 if (enter.failed())
256 return 0; 248 return 0;
257 return enter.functions()->CreateKeyboardInputEvent_1_0(instance, type, 249 return enter.functions()->CreateKeyboardInputEvent_1_0(
258 time_stamp, 250 instance, type, time_stamp, modifiers, key_code, character_text);
259 modifiers, key_code,
260 character_text);
261 } 251 }
262 252
263 PP_Resource CreateKeyboardInputEvent_1_2(PP_Instance instance, 253 PP_Resource CreateKeyboardInputEvent_1_2(PP_Instance instance,
264 PP_InputEvent_Type type, 254 PP_InputEvent_Type type,
265 PP_TimeTicks time_stamp, 255 PP_TimeTicks time_stamp,
266 uint32_t modifiers, 256 uint32_t modifiers,
267 uint32_t key_code, 257 uint32_t key_code,
268 struct PP_Var character_text, 258 struct PP_Var character_text,
269 struct PP_Var code) { 259 struct PP_Var code) {
270 VLOG(4) << "PPB_KeyboardInputEvent::Create()"; 260 VLOG(4) << "PPB_KeyboardInputEvent::Create()";
271 EnterResourceCreation enter(instance); 261 EnterResourceCreation enter(instance);
272 if (enter.failed()) 262 if (enter.failed())
273 return 0; 263 return 0;
274 return enter.functions()->CreateKeyboardInputEvent_1_2(instance, type, 264 return enter.functions()->CreateKeyboardInputEvent_1_2(
275 time_stamp, 265 instance, type, time_stamp, modifiers, key_code, character_text, code);
276 modifiers, key_code,
277 character_text, code);
278 } 266 }
279 267
280 PP_Bool IsKeyboardInputEvent(PP_Resource resource) { 268 PP_Bool IsKeyboardInputEvent(PP_Resource resource) {
281 VLOG(4) << "PPB_KeyboardInputEvent::IsKeyboardInputEvent()"; 269 VLOG(4) << "PPB_KeyboardInputEvent::IsKeyboardInputEvent()";
282 if (!IsInputEvent(resource)) 270 if (!IsInputEvent(resource))
283 return PP_FALSE; // Prevent warning log in GetType. 271 return PP_FALSE; // Prevent warning log in GetType.
284 PP_InputEvent_Type type = GetType(resource); 272 PP_InputEvent_Type type = GetType(resource);
285 return PP_FromBool(type == PP_INPUTEVENT_TYPE_KEYDOWN || 273 return PP_FromBool(
286 type == PP_INPUTEVENT_TYPE_KEYUP || 274 type == PP_INPUTEVENT_TYPE_KEYDOWN || type == PP_INPUTEVENT_TYPE_KEYUP ||
287 type == PP_INPUTEVENT_TYPE_RAWKEYDOWN || 275 type == PP_INPUTEVENT_TYPE_RAWKEYDOWN || type == PP_INPUTEVENT_TYPE_CHAR);
288 type == PP_INPUTEVENT_TYPE_CHAR);
289 } 276 }
290 277
291 uint32_t GetKeyCode(PP_Resource key_event) { 278 uint32_t GetKeyCode(PP_Resource key_event) {
292 VLOG(4) << "PPB_KeyboardInputEvent::GetKeyCode()"; 279 VLOG(4) << "PPB_KeyboardInputEvent::GetKeyCode()";
293 EnterInputEvent enter(key_event, true); 280 EnterInputEvent enter(key_event, true);
294 if (enter.failed()) 281 if (enter.failed())
295 return 0; 282 return 0;
296 return enter.object()->GetKeyCode(); 283 return enter.object()->GetKeyCode();
297 } 284 }
298 285
299 PP_Var GetCharacterText(PP_Resource character_event) { 286 PP_Var GetCharacterText(PP_Resource character_event) {
300 VLOG(4) << "PPB_KeyboardInputEvent::GetCharacterText()"; 287 VLOG(4) << "PPB_KeyboardInputEvent::GetCharacterText()";
301 EnterInputEvent enter(character_event, true); 288 EnterInputEvent enter(character_event, true);
302 if (enter.failed()) 289 if (enter.failed())
303 return PP_MakeUndefined(); 290 return PP_MakeUndefined();
304 return enter.object()->GetCharacterText(); 291 return enter.object()->GetCharacterText();
305 } 292 }
306 293
307 PP_Var GetCode(PP_Resource key_event) { 294 PP_Var GetCode(PP_Resource key_event) {
308 VLOG(4) << "PPB_KeyboardInputEvent::GetCode()"; 295 VLOG(4) << "PPB_KeyboardInputEvent::GetCode()";
309 EnterInputEvent enter(key_event, true); 296 EnterInputEvent enter(key_event, true);
310 if (enter.failed()) 297 if (enter.failed())
311 return PP_MakeUndefined(); 298 return PP_MakeUndefined();
312 return enter.object()->GetCode(); 299 return enter.object()->GetCode();
313 } 300 }
314 301
315 const PPB_KeyboardInputEvent_1_0 g_ppb_keyboard_input_event_1_0_thunk = { 302 const PPB_KeyboardInputEvent_1_0 g_ppb_keyboard_input_event_1_0_thunk = {
316 &CreateKeyboardInputEvent_1_0, 303 &CreateKeyboardInputEvent_1_0, &IsKeyboardInputEvent, &GetKeyCode,
317 &IsKeyboardInputEvent, 304 &GetCharacterText};
318 &GetKeyCode,
319 &GetCharacterText
320 };
321 305
322 const PPB_KeyboardInputEvent g_ppb_keyboard_input_event_thunk = { 306 const PPB_KeyboardInputEvent g_ppb_keyboard_input_event_thunk = {
323 &CreateKeyboardInputEvent_1_2, 307 &CreateKeyboardInputEvent_1_2, &IsKeyboardInputEvent, &GetKeyCode,
324 &IsKeyboardInputEvent, 308 &GetCharacterText, &GetCode};
325 &GetKeyCode,
326 &GetCharacterText,
327 &GetCode
328 };
329 309
330 // Composition ----------------------------------------------------------------- 310 // Composition -----------------------------------------------------------------
331 311
332 PP_Resource CreateIMEInputEvent(PP_Instance instance, 312 PP_Resource CreateIMEInputEvent(PP_Instance instance,
333 PP_InputEvent_Type type, 313 PP_InputEvent_Type type,
334 PP_TimeTicks time_stamp, 314 PP_TimeTicks time_stamp,
335 PP_Var text, 315 PP_Var text,
336 uint32_t segment_number, 316 uint32_t segment_number,
337 const uint32_t segment_offsets[], 317 const uint32_t segment_offsets[],
338 int32_t target_segment, 318 int32_t target_segment,
339 uint32_t selection_start, 319 uint32_t selection_start,
340 uint32_t selection_end) { 320 uint32_t selection_end) {
341 VLOG(4) << "PPB_IMEInputEvent_Dev::Create()"; 321 VLOG(4) << "PPB_IMEInputEvent_Dev::Create()";
342 EnterResourceCreation enter(instance); 322 EnterResourceCreation enter(instance);
343 if (enter.failed()) 323 if (enter.failed())
344 return 0; 324 return 0;
345 return enter.functions()->CreateIMEInputEvent(instance, type, time_stamp, 325 return enter.functions()->CreateIMEInputEvent(instance,
346 text, segment_number, 326 type,
327 time_stamp,
328 text,
329 segment_number,
347 segment_offsets, 330 segment_offsets,
348 target_segment, 331 target_segment,
349 selection_start, 332 selection_start,
350 selection_end); 333 selection_end);
351 } 334 }
352 335
353 PP_Bool IsIMEInputEvent(PP_Resource resource) { 336 PP_Bool IsIMEInputEvent(PP_Resource resource) {
354 VLOG(4) << "PPB_IMEInputEvent_Dev::IsIMEInputEvent()"; 337 VLOG(4) << "PPB_IMEInputEvent_Dev::IsIMEInputEvent()";
355 if (!IsInputEvent(resource)) 338 if (!IsInputEvent(resource))
356 return PP_FALSE; // Prevent warning log in GetType. 339 return PP_FALSE; // Prevent warning log in GetType.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 if (start) 380 if (start)
398 *start = 0; 381 *start = 0;
399 if (end) 382 if (end)
400 *end = 0; 383 *end = 0;
401 return; 384 return;
402 } 385 }
403 enter.object()->GetIMESelection(start, end); 386 enter.object()->GetIMESelection(start, end);
404 } 387 }
405 388
406 const PPB_IMEInputEvent_Dev_0_1 g_ppb_ime_input_event_0_1_thunk = { 389 const PPB_IMEInputEvent_Dev_0_1 g_ppb_ime_input_event_0_1_thunk = {
407 &IsIMEInputEvent, 390 &IsIMEInputEvent, &GetIMEText, &GetIMESegmentNumber,
408 &GetIMEText, 391 &GetIMESegmentOffset, &GetIMETargetSegment, &GetIMESelection};
409 &GetIMESegmentNumber,
410 &GetIMESegmentOffset,
411 &GetIMETargetSegment,
412 &GetIMESelection
413 };
414 392
415 const PPB_IMEInputEvent_Dev_0_2 g_ppb_ime_input_event_0_2_thunk = { 393 const PPB_IMEInputEvent_Dev_0_2 g_ppb_ime_input_event_0_2_thunk = {
416 &CreateIMEInputEvent, 394 &CreateIMEInputEvent, &IsIMEInputEvent, &GetIMEText,
417 &IsIMEInputEvent, 395 &GetIMESegmentNumber, &GetIMESegmentOffset, &GetIMETargetSegment,
418 &GetIMEText, 396 &GetIMESelection};
419 &GetIMESegmentNumber,
420 &GetIMESegmentOffset,
421 &GetIMETargetSegment,
422 &GetIMESelection
423 };
424 397
425 const PPB_IMEInputEvent_1_0 g_ppb_ime_input_event_1_0_thunk = { 398 const PPB_IMEInputEvent_1_0 g_ppb_ime_input_event_1_0_thunk = {
426 &CreateIMEInputEvent, 399 &CreateIMEInputEvent, &IsIMEInputEvent, &GetIMEText,
427 &IsIMEInputEvent, 400 &GetIMESegmentNumber, &GetIMESegmentOffset, &GetIMETargetSegment,
428 &GetIMEText, 401 &GetIMESelection};
429 &GetIMESegmentNumber,
430 &GetIMESegmentOffset,
431 &GetIMETargetSegment,
432 &GetIMESelection
433 };
434 402
435 // Touch ----------------------------------------------------------------------- 403 // Touch -----------------------------------------------------------------------
436 404
437 PP_Resource CreateTouchInputEvent(PP_Instance instance, 405 PP_Resource CreateTouchInputEvent(PP_Instance instance,
438 PP_InputEvent_Type type, 406 PP_InputEvent_Type type,
439 PP_TimeTicks time_stamp, 407 PP_TimeTicks time_stamp,
440 uint32_t modifiers) { 408 uint32_t modifiers) {
441 VLOG(4) << "PPB_TouchInputEvent::Create()"; 409 VLOG(4) << "PPB_TouchInputEvent::Create()";
442 EnterResourceCreation enter(instance); 410 EnterResourceCreation enter(instance);
443 if (enter.failed()) 411 if (enter.failed())
444 return 0; 412 return 0;
445 return enter.functions()->CreateTouchInputEvent(instance, type, time_stamp, 413 return enter.functions()->CreateTouchInputEvent(
446 modifiers); 414 instance, type, time_stamp, modifiers);
447 } 415 }
448 416
449 void AddTouchPoint(PP_Resource touch_event, 417 void AddTouchPoint(PP_Resource touch_event,
450 PP_TouchListType list, 418 PP_TouchListType list,
451 const PP_TouchPoint* point) { 419 const PP_TouchPoint* point) {
452 VLOG(4) << "PPB_TouchInputEvent::AddTouchPoint()"; 420 VLOG(4) << "PPB_TouchInputEvent::AddTouchPoint()";
453 EnterInputEvent enter(touch_event, true); 421 EnterInputEvent enter(touch_event, true);
454 if (enter.failed()) 422 if (enter.failed())
455 return; 423 return;
456 return enter.object()->AddTouchPoint(list, *point); 424 return enter.object()->AddTouchPoint(list, *point);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 PP_TouchListType list, 457 PP_TouchListType list,
490 uint32_t id) { 458 uint32_t id) {
491 VLOG(4) << "PPB_TouchInputEvent::GetTouchById()"; 459 VLOG(4) << "PPB_TouchInputEvent::GetTouchById()";
492 EnterInputEvent enter(touch_event, true); 460 EnterInputEvent enter(touch_event, true);
493 if (enter.failed()) 461 if (enter.failed())
494 return PP_MakeTouchPoint(); 462 return PP_MakeTouchPoint();
495 return enter.object()->GetTouchById(list, id); 463 return enter.object()->GetTouchById(list, id);
496 } 464 }
497 465
498 const PPB_TouchInputEvent_1_0 g_ppb_touch_input_event_thunk = { 466 const PPB_TouchInputEvent_1_0 g_ppb_touch_input_event_thunk = {
499 &CreateTouchInputEvent, 467 &CreateTouchInputEvent, &AddTouchPoint, &IsTouchInputEvent,
500 &AddTouchPoint, 468 &GetTouchCount, &GetTouchByIndex, &GetTouchById};
501 &IsTouchInputEvent,
502 &GetTouchCount,
503 &GetTouchByIndex,
504 &GetTouchById
505 };
506 469
507 } // namespace 470 } // namespace
508 471
509 const PPB_InputEvent_1_0* GetPPB_InputEvent_1_0_Thunk() { 472 const PPB_InputEvent_1_0* GetPPB_InputEvent_1_0_Thunk() {
510 return &g_ppb_input_event_thunk; 473 return &g_ppb_input_event_thunk;
511 } 474 }
512 475
513 const PPB_MouseInputEvent_1_0* GetPPB_MouseInputEvent_1_0_Thunk() { 476 const PPB_MouseInputEvent_1_0* GetPPB_MouseInputEvent_1_0_Thunk() {
514 return &g_ppb_mouse_input_event_1_0_thunk; 477 return &g_ppb_mouse_input_event_1_0_thunk;
515 } 478 }
(...skipping 25 matching lines...) Expand all
541 const PPB_IMEInputEvent_1_0* GetPPB_IMEInputEvent_1_0_Thunk() { 504 const PPB_IMEInputEvent_1_0* GetPPB_IMEInputEvent_1_0_Thunk() {
542 return &g_ppb_ime_input_event_1_0_thunk; 505 return &g_ppb_ime_input_event_1_0_thunk;
543 } 506 }
544 507
545 const PPB_TouchInputEvent_1_0* GetPPB_TouchInputEvent_1_0_Thunk() { 508 const PPB_TouchInputEvent_1_0* GetPPB_TouchInputEvent_1_0_Thunk() {
546 return &g_ppb_touch_input_event_thunk; 509 return &g_ppb_touch_input_event_thunk;
547 } 510 }
548 511
549 } // namespace thunk 512 } // namespace thunk
550 } // namespace ppapi 513 } // namespace ppapi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698