| 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 expected_pointer.state = WebTouchPoint::StatePressed; | 49 expected_pointer.state = WebTouchPoint::StatePressed; |
| 50 expected_pointer.position = blink::WebFloatPoint(pointer.x, pointer.y); | 50 expected_pointer.position = blink::WebFloatPoint(pointer.x, pointer.y); |
| 51 expected_pointer.screenPosition = | 51 expected_pointer.screenPosition = |
| 52 blink::WebFloatPoint(pointer.raw_x, pointer.raw_y); | 52 blink::WebFloatPoint(pointer.raw_x, pointer.raw_y); |
| 53 expected_pointer.radiusX = pointer.touch_major / 2.f; | 53 expected_pointer.radiusX = pointer.touch_major / 2.f; |
| 54 expected_pointer.radiusY = pointer.touch_minor / 2.f; | 54 expected_pointer.radiusY = pointer.touch_minor / 2.f; |
| 55 expected_pointer.rotationAngle = 0.f; | 55 expected_pointer.rotationAngle = 0.f; |
| 56 expected_pointer.force = pointer.pressure; | 56 expected_pointer.force = pointer.pressure; |
| 57 expected_event.touches[0] = expected_pointer; | 57 expected_event.touches[0] = expected_pointer; |
| 58 | 58 |
| 59 WebTouchEvent actual_event = CreateWebTouchEventFromMotionEvent(event); | 59 WebTouchEvent actual_event = CreateWebTouchEventFromMotionEvent(event, false); |
| 60 EXPECT_EQ(WebInputEventTraits::ToString(expected_event), | 60 EXPECT_EQ(WebInputEventTraits::ToString(expected_event), |
| 61 WebInputEventTraits::ToString(actual_event)); | 61 WebInputEventTraits::ToString(actual_event)); |
| 62 } | 62 } |
| 63 | 63 |
| 64 TEST(WebInputEventUtilTest, ScrollUpdateConversion) { | 64 TEST(WebInputEventUtilTest, ScrollUpdateConversion) { |
| 65 int motion_event_id = 0; | 65 int motion_event_id = 0; |
| 66 MotionEvent::ToolType tool_type = MotionEvent::TOOL_TYPE_UNKNOWN; | 66 MotionEvent::ToolType tool_type = MotionEvent::TOOL_TYPE_UNKNOWN; |
| 67 base::TimeTicks timestamp = base::TimeTicks::Now(); | 67 base::TimeTicks timestamp = base::TimeTicks::Now(); |
| 68 gfx::Vector2dF delta(-5.f, 10.f); | 68 gfx::Vector2dF delta(-5.f, 10.f); |
| 69 gfx::PointF pos(1.f, 2.f); | 69 gfx::PointF pos(1.f, 2.f); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 97 EXPECT_EQ(gfx::ToFlooredInt(pos.y()), web_event.y); | 97 EXPECT_EQ(gfx::ToFlooredInt(pos.y()), web_event.y); |
| 98 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.x()), web_event.globalX); | 98 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.x()), web_event.globalX); |
| 99 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.y()), web_event.globalY); | 99 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.y()), web_event.globalY); |
| 100 EXPECT_EQ(blink::WebGestureDeviceTouchscreen, web_event.sourceDevice); | 100 EXPECT_EQ(blink::WebGestureDeviceTouchscreen, web_event.sourceDevice); |
| 101 EXPECT_EQ(delta.x(), web_event.data.scrollUpdate.deltaX); | 101 EXPECT_EQ(delta.x(), web_event.data.scrollUpdate.deltaX); |
| 102 EXPECT_EQ(delta.y(), web_event.data.scrollUpdate.deltaY); | 102 EXPECT_EQ(delta.y(), web_event.data.scrollUpdate.deltaY); |
| 103 EXPECT_TRUE(web_event.data.scrollUpdate.previousUpdateInSequencePrevented); | 103 EXPECT_TRUE(web_event.data.scrollUpdate.previousUpdateInSequencePrevented); |
| 104 } | 104 } |
| 105 | 105 |
| 106 } // namespace content | 106 } // namespace content |
| OLD | NEW |