| 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 <cmath> | 10 #include <cmath> |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 ui::PointerProperties pointer(5, 10, 40); | 31 ui::PointerProperties pointer(5, 10, 40); |
| 32 pointer.id = 15; | 32 pointer.id = 15; |
| 33 pointer.raw_x = 20; | 33 pointer.raw_x = 20; |
| 34 pointer.raw_y = 25; | 34 pointer.raw_y = 25; |
| 35 pointer.pressure = 30; | 35 pointer.pressure = 30; |
| 36 pointer.touch_minor = 35; | 36 pointer.touch_minor = 35; |
| 37 pointer.orientation = static_cast<float>(-M_PI / 2); | 37 pointer.orientation = static_cast<float>(-M_PI / 2); |
| 38 MotionEventGeneric event( | 38 MotionEventGeneric event( |
| 39 MotionEvent::ACTION_DOWN, base::TimeTicks::Now(), pointer); | 39 MotionEvent::ACTION_DOWN, base::TimeTicks::Now(), pointer); |
| 40 event.set_flags(ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN); | 40 event.set_flags(ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN); |
| 41 event.set_unique_event_id(123456U); |
| 41 | 42 |
| 42 WebTouchEvent expected_event; | 43 WebTouchEvent expected_event; |
| 43 expected_event.type = WebInputEvent::TouchStart; | 44 expected_event.type = WebInputEvent::TouchStart; |
| 44 expected_event.touchesLength = 1; | 45 expected_event.touchesLength = 1; |
| 45 expected_event.timeStampSeconds = | 46 expected_event.timeStampSeconds = |
| 46 (event.GetEventTime() - base::TimeTicks()).InSecondsF(); | 47 (event.GetEventTime() - base::TimeTicks()).InSecondsF(); |
| 47 expected_event.modifiers = WebInputEvent::ShiftKey | WebInputEvent::AltKey; | 48 expected_event.modifiers = WebInputEvent::ShiftKey | WebInputEvent::AltKey; |
| 48 WebTouchPoint expected_pointer; | 49 WebTouchPoint expected_pointer; |
| 49 expected_pointer.id = pointer.id; | 50 expected_pointer.id = pointer.id; |
| 50 expected_pointer.state = WebTouchPoint::StatePressed; | 51 expected_pointer.state = WebTouchPoint::StatePressed; |
| 51 expected_pointer.position = blink::WebFloatPoint(pointer.x, pointer.y); | 52 expected_pointer.position = blink::WebFloatPoint(pointer.x, pointer.y); |
| 52 expected_pointer.screenPosition = | 53 expected_pointer.screenPosition = |
| 53 blink::WebFloatPoint(pointer.raw_x, pointer.raw_y); | 54 blink::WebFloatPoint(pointer.raw_x, pointer.raw_y); |
| 54 expected_pointer.radiusX = pointer.touch_major / 2.f; | 55 expected_pointer.radiusX = pointer.touch_major / 2.f; |
| 55 expected_pointer.radiusY = pointer.touch_minor / 2.f; | 56 expected_pointer.radiusY = pointer.touch_minor / 2.f; |
| 56 expected_pointer.rotationAngle = 0.f; | 57 expected_pointer.rotationAngle = 0.f; |
| 57 expected_pointer.force = pointer.pressure; | 58 expected_pointer.force = pointer.pressure; |
| 58 expected_event.touches[0] = expected_pointer; | 59 expected_event.touches[0] = expected_pointer; |
| 60 expected_event.uniqueTouchEventId = 123456U; |
| 59 | 61 |
| 60 WebTouchEvent actual_event = | 62 WebTouchEvent actual_event = |
| 61 ui::CreateWebTouchEventFromMotionEvent(event, false); | 63 ui::CreateWebTouchEventFromMotionEvent(event, false); |
| 62 EXPECT_EQ(WebInputEventTraits::ToString(expected_event), | 64 EXPECT_EQ(WebInputEventTraits::ToString(expected_event), |
| 63 WebInputEventTraits::ToString(actual_event)); | 65 WebInputEventTraits::ToString(actual_event)); |
| 64 } | 66 } |
| 65 | 67 |
| 66 TEST(WebInputEventUtilTest, ScrollUpdateConversion) { | 68 TEST(WebInputEventUtilTest, ScrollUpdateConversion) { |
| 67 int motion_event_id = 0; | 69 int motion_event_id = 0; |
| 68 MotionEvent::ToolType tool_type = MotionEvent::TOOL_TYPE_UNKNOWN; | 70 MotionEvent::ToolType tool_type = MotionEvent::TOOL_TYPE_UNKNOWN; |
| (...skipping 30 matching lines...) Expand all Loading... |
| 99 EXPECT_EQ(gfx::ToFlooredInt(pos.y()), web_event.y); | 101 EXPECT_EQ(gfx::ToFlooredInt(pos.y()), web_event.y); |
| 100 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.x()), web_event.globalX); | 102 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.x()), web_event.globalX); |
| 101 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.y()), web_event.globalY); | 103 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.y()), web_event.globalY); |
| 102 EXPECT_EQ(blink::WebGestureDeviceTouchscreen, web_event.sourceDevice); | 104 EXPECT_EQ(blink::WebGestureDeviceTouchscreen, web_event.sourceDevice); |
| 103 EXPECT_EQ(delta.x(), web_event.data.scrollUpdate.deltaX); | 105 EXPECT_EQ(delta.x(), web_event.data.scrollUpdate.deltaX); |
| 104 EXPECT_EQ(delta.y(), web_event.data.scrollUpdate.deltaY); | 106 EXPECT_EQ(delta.y(), web_event.data.scrollUpdate.deltaY); |
| 105 EXPECT_TRUE(web_event.data.scrollUpdate.previousUpdateInSequencePrevented); | 107 EXPECT_TRUE(web_event.data.scrollUpdate.previousUpdateInSequencePrevented); |
| 106 } | 108 } |
| 107 | 109 |
| 108 } // namespace content | 110 } // namespace content |
| OLD | NEW |