| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 // Needed on Windows to get |M_PI| from <cmath>. | 5 // Needed on Windows to get |M_PI| from <cmath>. |
| 6 #ifdef _WIN32 | 6 #ifdef _WIN32 |
| 7 #define _USE_MATH_DEFINES | 7 #define _USE_MATH_DEFINES |
| 8 #endif | 8 #endif |
| 9 | 9 |
| 10 #include <stddef.h> | 10 #include <stddef.h> |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 const MotionEvent::ToolType tool_types[] = {MotionEvent::TOOL_TYPE_FINGER, | 34 const MotionEvent::ToolType tool_types[] = {MotionEvent::TOOL_TYPE_FINGER, |
| 35 MotionEvent::TOOL_TYPE_STYLUS, | 35 MotionEvent::TOOL_TYPE_STYLUS, |
| 36 MotionEvent::TOOL_TYPE_MOUSE}; | 36 MotionEvent::TOOL_TYPE_MOUSE}; |
| 37 ui::PointerProperties pointer(5, 10, 40); | 37 ui::PointerProperties pointer(5, 10, 40); |
| 38 pointer.id = 15; | 38 pointer.id = 15; |
| 39 pointer.raw_x = 20; | 39 pointer.raw_x = 20; |
| 40 pointer.raw_y = 25; | 40 pointer.raw_y = 25; |
| 41 pointer.pressure = 30; | 41 pointer.pressure = 30; |
| 42 pointer.touch_minor = 35; | 42 pointer.touch_minor = 35; |
| 43 pointer.orientation = static_cast<float>(-M_PI / 2); | 43 pointer.orientation = static_cast<float>(-M_PI / 2); |
| 44 pointer.tilt = static_cast<float>(M_PI / 3); | 44 pointer.tilt_x = 60; |
| 45 pointer.tilt_y = 70; |
| 45 for (MotionEvent::ToolType tool_type : tool_types) { | 46 for (MotionEvent::ToolType tool_type : tool_types) { |
| 46 pointer.tool_type = tool_type; | 47 pointer.tool_type = tool_type; |
| 47 MotionEventGeneric event( | 48 MotionEventGeneric event( |
| 48 MotionEvent::ACTION_DOWN, base::TimeTicks::Now(), pointer); | 49 MotionEvent::ACTION_DOWN, base::TimeTicks::Now(), pointer); |
| 49 event.set_flags(ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN); | 50 event.set_flags(ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN); |
| 50 event.set_unique_event_id(123456U); | 51 event.set_unique_event_id(123456U); |
| 51 | 52 |
| 52 WebTouchEvent expected_event( | 53 WebTouchEvent expected_event( |
| 53 WebInputEvent::kTouchStart, | 54 WebInputEvent::kTouchStart, |
| 54 WebInputEvent::kShiftKey | WebInputEvent::kAltKey, | 55 WebInputEvent::kShiftKey | WebInputEvent::kAltKey, |
| 55 (event.GetEventTime() - base::TimeTicks()).InSecondsF()); | 56 (event.GetEventTime() - base::TimeTicks()).InSecondsF()); |
| 56 expected_event.touches_length = 1; | 57 expected_event.touches_length = 1; |
| 57 WebTouchPoint expected_pointer; | 58 WebTouchPoint expected_pointer; |
| 58 expected_pointer.id = pointer.id; | 59 expected_pointer.id = pointer.id; |
| 59 expected_pointer.state = WebTouchPoint::kStatePressed; | 60 expected_pointer.state = WebTouchPoint::kStatePressed; |
| 60 expected_pointer.position = blink::WebFloatPoint(pointer.x, pointer.y); | 61 expected_pointer.position = blink::WebFloatPoint(pointer.x, pointer.y); |
| 61 expected_pointer.screen_position = | 62 expected_pointer.screen_position = |
| 62 blink::WebFloatPoint(pointer.raw_x, pointer.raw_y); | 63 blink::WebFloatPoint(pointer.raw_x, pointer.raw_y); |
| 63 expected_pointer.radius_x = pointer.touch_major / 2.f; | 64 expected_pointer.radius_x = pointer.touch_major / 2.f; |
| 64 expected_pointer.radius_y = pointer.touch_minor / 2.f; | 65 expected_pointer.radius_y = pointer.touch_minor / 2.f; |
| 65 expected_pointer.rotation_angle = 0.f; | 66 expected_pointer.rotation_angle = 0.f; |
| 66 expected_pointer.force = pointer.pressure; | 67 expected_pointer.force = pointer.pressure; |
| 67 if (tool_type == MotionEvent::TOOL_TYPE_STYLUS) { | 68 if (tool_type == MotionEvent::TOOL_TYPE_STYLUS) { |
| 68 expected_pointer.tilt_x = 60; | 69 expected_pointer.tilt_x = 60; |
| 69 expected_pointer.tilt_y = 0; | 70 expected_pointer.tilt_y = 70; |
| 70 } else { | 71 } else { |
| 71 expected_pointer.tilt_x = 0; | 72 expected_pointer.tilt_x = 0; |
| 72 expected_pointer.tilt_y = 0; | 73 expected_pointer.tilt_y = 0; |
| 73 } | 74 } |
| 74 expected_event.touches[0] = expected_pointer; | 75 expected_event.touches[0] = expected_pointer; |
| 75 expected_event.unique_touch_event_id = 123456U; | 76 expected_event.unique_touch_event_id = 123456U; |
| 76 | 77 |
| 77 WebTouchEvent actual_event = | 78 WebTouchEvent actual_event = |
| 78 ui::CreateWebTouchEventFromMotionEvent(event, false); | 79 ui::CreateWebTouchEventFromMotionEvent(event, false); |
| 79 EXPECT_EQ(ui::WebInputEventTraits::ToString(expected_event), | 80 EXPECT_EQ(ui::WebInputEventTraits::ToString(expected_event), |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.x()), web_event.global_x); | 121 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.x()), web_event.global_x); |
| 121 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.y()), web_event.global_y); | 122 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.y()), web_event.global_y); |
| 122 EXPECT_EQ(blink::kWebGestureDeviceTouchscreen, web_event.source_device); | 123 EXPECT_EQ(blink::kWebGestureDeviceTouchscreen, web_event.source_device); |
| 123 EXPECT_EQ(delta.x(), web_event.data.scroll_update.delta_x); | 124 EXPECT_EQ(delta.x(), web_event.data.scroll_update.delta_x); |
| 124 EXPECT_EQ(delta.y(), web_event.data.scroll_update.delta_y); | 125 EXPECT_EQ(delta.y(), web_event.data.scroll_update.delta_y); |
| 125 EXPECT_TRUE( | 126 EXPECT_TRUE( |
| 126 web_event.data.scroll_update.previous_update_in_sequence_prevented); | 127 web_event.data.scroll_update.previous_update_in_sequence_prevented); |
| 127 } | 128 } |
| 128 | 129 |
| 129 } // namespace content | 130 } // namespace content |
| OLD | NEW |