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

Side by Side Diff: content/browser/renderer_host/input/web_input_event_util_unittest.cc

Issue 755403006: Added experimental Touch.tilt, Touch.tiltDirection support for Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unused code (event_sender.cc) Created 5 years, 9 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
OLDNEW
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 16 matching lines...) Expand all
27 namespace content { 27 namespace content {
28 28
29 TEST(WebInputEventUtilTest, MotionEventConversion) { 29 TEST(WebInputEventUtilTest, MotionEventConversion) {
30 ui::PointerProperties pointer(5, 10, 40); 30 ui::PointerProperties pointer(5, 10, 40);
31 pointer.id = 15; 31 pointer.id = 15;
32 pointer.raw_x = 20; 32 pointer.raw_x = 20;
33 pointer.raw_y = 25; 33 pointer.raw_y = 25;
34 pointer.pressure = 30; 34 pointer.pressure = 30;
35 pointer.touch_minor = 35; 35 pointer.touch_minor = 35;
36 pointer.orientation = static_cast<float>(-M_PI / 2); 36 pointer.orientation = static_cast<float>(-M_PI / 2);
37 pointer.tilt = 0.f;
37 MotionEventGeneric event( 38 MotionEventGeneric event(
38 MotionEvent::ACTION_DOWN, base::TimeTicks::Now(), pointer); 39 MotionEvent::ACTION_DOWN, base::TimeTicks::Now(), pointer);
39 event.set_flags(ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN); 40 event.set_flags(ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
40 41
41 WebTouchEvent expected_event; 42 WebTouchEvent expected_event;
42 expected_event.type = WebInputEvent::TouchStart; 43 expected_event.type = WebInputEvent::TouchStart;
43 expected_event.touchesLength = 1; 44 expected_event.touchesLength = 1;
44 expected_event.timeStampSeconds = 45 expected_event.timeStampSeconds =
45 (event.GetEventTime() - base::TimeTicks()).InSecondsF(); 46 (event.GetEventTime() - base::TimeTicks()).InSecondsF();
46 expected_event.modifiers = WebInputEvent::ShiftKey | WebInputEvent::AltKey; 47 expected_event.modifiers = WebInputEvent::ShiftKey | WebInputEvent::AltKey;
47 WebTouchPoint expected_pointer; 48 WebTouchPoint expected_pointer;
48 expected_pointer.id = pointer.id; 49 expected_pointer.id = pointer.id;
49 expected_pointer.state = WebTouchPoint::StatePressed; 50 expected_pointer.state = WebTouchPoint::StatePressed;
50 expected_pointer.position = blink::WebFloatPoint(pointer.x, pointer.y); 51 expected_pointer.position = blink::WebFloatPoint(pointer.x, pointer.y);
51 expected_pointer.screenPosition = 52 expected_pointer.screenPosition =
52 blink::WebFloatPoint(pointer.raw_x, pointer.raw_y); 53 blink::WebFloatPoint(pointer.raw_x, pointer.raw_y);
53 expected_pointer.radiusX = pointer.touch_major / 2.f; 54 expected_pointer.radiusX = pointer.touch_major / 2.f;
54 expected_pointer.radiusY = pointer.touch_minor / 2.f; 55 expected_pointer.radiusY = pointer.touch_minor / 2.f;
55 expected_pointer.rotationAngle = 0.f; 56 expected_pointer.rotationAngle = 0.f;
57 expected_pointer.tilt = 0.f;
58 expected_pointer.tiltDirection = 0.f;
56 expected_pointer.force = pointer.pressure; 59 expected_pointer.force = pointer.pressure;
57 expected_event.touches[0] = expected_pointer; 60 expected_event.touches[0] = expected_pointer;
58 61
59 WebTouchEvent actual_event = CreateWebTouchEventFromMotionEvent(event, false); 62 WebTouchEvent actual_event = CreateWebTouchEventFromMotionEvent(event, false);
60 EXPECT_EQ(WebInputEventTraits::ToString(expected_event), 63 EXPECT_EQ(WebInputEventTraits::ToString(expected_event),
61 WebInputEventTraits::ToString(actual_event)); 64 WebInputEventTraits::ToString(actual_event));
62 } 65 }
63 66
64 TEST(WebInputEventUtilTest, ScrollUpdateConversion) { 67 TEST(WebInputEventUtilTest, ScrollUpdateConversion) {
65 int motion_event_id = 0; 68 int motion_event_id = 0;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 EXPECT_EQ(gfx::ToFlooredInt(pos.y()), web_event.y); 100 EXPECT_EQ(gfx::ToFlooredInt(pos.y()), web_event.y);
98 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.x()), web_event.globalX); 101 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.x()), web_event.globalX);
99 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.y()), web_event.globalY); 102 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.y()), web_event.globalY);
100 EXPECT_EQ(blink::WebGestureDeviceTouchscreen, web_event.sourceDevice); 103 EXPECT_EQ(blink::WebGestureDeviceTouchscreen, web_event.sourceDevice);
101 EXPECT_EQ(delta.x(), web_event.data.scrollUpdate.deltaX); 104 EXPECT_EQ(delta.x(), web_event.data.scrollUpdate.deltaX);
102 EXPECT_EQ(delta.y(), web_event.data.scrollUpdate.deltaY); 105 EXPECT_EQ(delta.y(), web_event.data.scrollUpdate.deltaY);
103 EXPECT_TRUE(web_event.data.scrollUpdate.previousUpdateInSequencePrevented); 106 EXPECT_TRUE(web_event.data.scrollUpdate.previousUpdateInSequencePrevented);
104 } 107 }
105 108
106 } // namespace content 109 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/input/web_input_event_util.cc ('k') | content/browser/renderer_host/ui_events_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698