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

Side by Side Diff: ui/events/blink/web_input_event.cc

Issue 2265133002: Remove unused gesture event builder on windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/blink/web_input_event.h" 5 #include "ui/events/blink/web_input_event.h"
6 6
7 #include "ui/events/base_event_utils.h" 7 #include "ui/events/base_event_utils.h"
8 #include "ui/events/blink/blink_event_util.h" 8 #include "ui/events/blink/blink_event_util.h"
9 #include "ui/events/event.h" 9 #include "ui/events/event.h"
10 #include "ui/events/event_utils.h" 10 #include "ui/events/event_utils.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 pointer_type); 82 pointer_type);
83 } 83 }
84 84
85 blink::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent( 85 blink::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent(
86 const base::NativeEvent& native_event, 86 const base::NativeEvent& native_event,
87 const base::TimeTicks& time_stamp) { 87 const base::TimeTicks& time_stamp) {
88 return WebKeyboardEventBuilder::Build( 88 return WebKeyboardEventBuilder::Build(
89 native_event.hwnd, native_event.message, native_event.wParam, 89 native_event.hwnd, native_event.message, native_event.wParam,
90 native_event.lParam, ui::EventTimeStampToSeconds(time_stamp)); 90 native_event.lParam, ui::EventTimeStampToSeconds(time_stamp));
91 } 91 }
92
93 blink::WebGestureEvent MakeWebGestureEventFromNativeEvent(
94 const base::NativeEvent& native_event,
95 const base::TimeTicks& time_stamp) {
96 // TODO: Create gestures from native event.
97 NOTIMPLEMENTED();
98 return blink::WebGestureEvent();
99 }
100
101 #endif // defined(OS_WIN) 92 #endif // defined(OS_WIN)
102 93
103 blink::WebKeyboardEvent MakeWebKeyboardEventFromUiEvent(const KeyEvent& event) { 94 blink::WebKeyboardEvent MakeWebKeyboardEventFromUiEvent(const KeyEvent& event) {
104 blink::WebKeyboardEvent webkit_event; 95 blink::WebKeyboardEvent webkit_event;
105 96
106 webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp()); 97 webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
107 webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags()) | 98 webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags()) |
108 DomCodeToWebInputEventModifiers(event.code()); 99 DomCodeToWebInputEventModifiers(event.code());
109 100
110 switch (event.type()) { 101 switch (event.type()) {
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 return webkit_event; 334 return webkit_event;
344 } 335 }
345 #endif 336 #endif
346 return MakeWebKeyboardEventFromUiEvent(event); 337 return MakeWebKeyboardEventFromUiEvent(event);
347 } 338 }
348 339
349 blink::WebGestureEvent MakeWebGestureEvent( 340 blink::WebGestureEvent MakeWebGestureEvent(
350 const GestureEvent& event, 341 const GestureEvent& event,
351 const base::Callback<gfx::Point(const ui::LocatedEvent& event)>& 342 const base::Callback<gfx::Point(const ui::LocatedEvent& event)>&
352 screen_location_callback) { 343 screen_location_callback) {
353 blink::WebGestureEvent gesture_event; 344 blink::WebGestureEvent gesture_event = MakeWebGestureEventFromUIEvent(event);
354 #if defined(OS_WIN)
355 if (event.HasNativeEvent())
356 gesture_event = MakeWebGestureEventFromNativeEvent(event.native_event(),
357 event.time_stamp());
358 else
359 gesture_event = MakeWebGestureEventFromUIEvent(event);
360 #else
361 gesture_event = MakeWebGestureEventFromUIEvent(event);
362 #endif
363 345
364 gesture_event.x = event.x(); 346 gesture_event.x = event.x();
365 gesture_event.y = event.y(); 347 gesture_event.y = event.y();
366 348
367 const gfx::Point screen_point = 349 const gfx::Point screen_point =
368 GetScreenLocationFromEvent(event, screen_location_callback); 350 GetScreenLocationFromEvent(event, screen_location_callback);
369 gesture_event.globalX = screen_point.x(); 351 gesture_event.globalX = screen_point.x();
370 gesture_event.globalY = screen_point.y(); 352 gesture_event.globalY = screen_point.y();
371 353
372 return gesture_event; 354 return gesture_event;
373 } 355 }
374 356
375 blink::WebGestureEvent MakeWebGestureEvent( 357 blink::WebGestureEvent MakeWebGestureEvent(
376 const ScrollEvent& event, 358 const ScrollEvent& event,
377 const base::Callback<gfx::Point(const ui::LocatedEvent& event)>& 359 const base::Callback<gfx::Point(const ui::LocatedEvent& event)>&
378 screen_location_callback) { 360 screen_location_callback) {
379 blink::WebGestureEvent gesture_event; 361 blink::WebGestureEvent gesture_event = MakeWebGestureEventFromUiEvent(event);
380
381 #if defined(OS_WIN)
382 gesture_event = MakeWebGestureEventFromNativeEvent(event.native_event(),
383 event.time_stamp());
384 #else
385 gesture_event = MakeWebGestureEventFromUiEvent(event);
386 #endif
387
388 gesture_event.x = event.x(); 362 gesture_event.x = event.x();
389 gesture_event.y = event.y(); 363 gesture_event.y = event.y();
390 364
391 const gfx::Point screen_point = 365 const gfx::Point screen_point =
392 GetScreenLocationFromEvent(event, screen_location_callback); 366 GetScreenLocationFromEvent(event, screen_location_callback);
393 gesture_event.globalX = screen_point.x(); 367 gesture_event.globalX = screen_point.x();
394 gesture_event.globalY = screen_point.y(); 368 gesture_event.globalY = screen_point.y();
395 369
396 return gesture_event; 370 return gesture_event;
397 } 371 }
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 webkit_event.tiltX = roundf(event.pointer_details().tilt_x); 453 webkit_event.tiltX = roundf(event.pointer_details().tilt_x);
480 webkit_event.tiltY = roundf(event.pointer_details().tilt_y); 454 webkit_event.tiltY = roundf(event.pointer_details().tilt_y);
481 webkit_event.force = event.pointer_details().force; 455 webkit_event.force = event.pointer_details().force;
482 webkit_event.pointerType = 456 webkit_event.pointerType =
483 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type); 457 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type);
484 458
485 return webkit_event; 459 return webkit_event;
486 } 460 }
487 461
488 } // namespace ui 462 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698