| OLD | NEW |
| 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 "content/browser/renderer_host/web_input_event_aura.h" | 5 #include "content/browser/renderer_host/web_input_event_aura.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "content/browser/renderer_host/input/web_input_event_util.h" | 8 #include "content/browser/renderer_host/input/web_input_event_util.h" |
| 9 #include "content/browser/renderer_host/ui_events_helper.h" | 9 #include "content/browser/renderer_host/ui_events_helper.h" |
| 10 #include "ui/aura/client/screen_position_client.h" | 10 #include "ui/aura/client/screen_position_client.h" |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 case ui::ET_MOUSE_DRAGGED: | 394 case ui::ET_MOUSE_DRAGGED: |
| 395 webkit_event.type = blink::WebInputEvent::MouseMove; | 395 webkit_event.type = blink::WebInputEvent::MouseMove; |
| 396 break; | 396 break; |
| 397 default: | 397 default: |
| 398 NOTIMPLEMENTED() << "Received unexpected event: " << event.type(); | 398 NOTIMPLEMENTED() << "Received unexpected event: " << event.type(); |
| 399 break; | 399 break; |
| 400 } | 400 } |
| 401 | 401 |
| 402 webkit_event.tiltX = roundf(event.pointer_details().tilt_x()); | 402 webkit_event.tiltX = roundf(event.pointer_details().tilt_x()); |
| 403 webkit_event.tiltY = roundf(event.pointer_details().tilt_y()); | 403 webkit_event.tiltY = roundf(event.pointer_details().tilt_y()); |
| 404 webkit_event.force = event.pointer_details().force(); | |
| 405 webkit_event.pointerType = | 404 webkit_event.pointerType = |
| 406 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type()); | 405 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type()); |
| 407 | 406 |
| 407 // TODO(crbug.com/581066): Set mouse pressure if it is supported |
| 408 if (webkit_event.pointerType != |
| 409 blink::WebPointerProperties::PointerType::Mouse) |
| 410 webkit_event.force = event.pointer_details().force(); |
| 411 |
| 408 return webkit_event; | 412 return webkit_event; |
| 409 } | 413 } |
| 410 | 414 |
| 411 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( | 415 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( |
| 412 const ui::MouseWheelEvent& event) { | 416 const ui::MouseWheelEvent& event) { |
| 413 blink::WebMouseWheelEvent webkit_event; | 417 blink::WebMouseWheelEvent webkit_event; |
| 414 | 418 |
| 415 webkit_event.type = blink::WebInputEvent::MouseWheel; | 419 webkit_event.type = blink::WebInputEvent::MouseWheel; |
| 416 webkit_event.button = blink::WebMouseEvent::ButtonNone; | 420 webkit_event.button = blink::WebMouseEvent::ButtonNone; |
| 417 webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags()); | 421 webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags()); |
| 418 webkit_event.timeStampSeconds = event.time_stamp().InSecondsF(); | 422 webkit_event.timeStampSeconds = event.time_stamp().InSecondsF(); |
| 419 | 423 |
| 420 if ((event.flags() & ui::EF_SHIFT_DOWN) != 0 && event.x_offset() == 0) { | 424 if ((event.flags() & ui::EF_SHIFT_DOWN) != 0 && event.x_offset() == 0) { |
| 421 webkit_event.deltaX = event.y_offset(); | 425 webkit_event.deltaX = event.y_offset(); |
| 422 webkit_event.deltaY = 0; | 426 webkit_event.deltaY = 0; |
| 423 } else { | 427 } else { |
| 424 webkit_event.deltaX = event.x_offset(); | 428 webkit_event.deltaX = event.x_offset(); |
| 425 webkit_event.deltaY = event.y_offset(); | 429 webkit_event.deltaY = event.y_offset(); |
| 426 } | 430 } |
| 427 | 431 |
| 428 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; | 432 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; |
| 429 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; | 433 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; |
| 430 | 434 |
| 431 webkit_event.tiltX = roundf(event.pointer_details().tilt_x()); | 435 webkit_event.tiltX = roundf(event.pointer_details().tilt_x()); |
| 432 webkit_event.tiltY = roundf(event.pointer_details().tilt_y()); | 436 webkit_event.tiltY = roundf(event.pointer_details().tilt_y()); |
| 433 webkit_event.force = event.pointer_details().force(); | |
| 434 webkit_event.pointerType = | 437 webkit_event.pointerType = |
| 435 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type()); | 438 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type()); |
| 436 | 439 |
| 440 // TODO(crbug.com/581066): Set mouse pressure if it is supported |
| 441 if (webkit_event.pointerType != |
| 442 blink::WebPointerProperties::PointerType::Mouse) |
| 443 webkit_event.force = event.pointer_details().force(); |
| 444 |
| 437 return webkit_event; | 445 return webkit_event; |
| 438 } | 446 } |
| 439 | 447 |
| 440 } // namespace content | 448 } // namespace content |
| OLD | NEW |