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

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

Issue 2569273002: Add constructors to WebInputEvents and setters so we can work at cleaning up these public structs. (Closed)
Patch Set: Rebase Created 3 years, 11 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 <stddef.h> 10 #include <stddef.h>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 = static_cast<float>(M_PI / 3);
45 for (MotionEvent::ToolType tool_type : tool_types) { 45 for (MotionEvent::ToolType tool_type : tool_types) {
46 pointer.tool_type = tool_type; 46 pointer.tool_type = tool_type;
47 MotionEventGeneric event( 47 MotionEventGeneric event(
48 MotionEvent::ACTION_DOWN, base::TimeTicks::Now(), pointer); 48 MotionEvent::ACTION_DOWN, base::TimeTicks::Now(), pointer);
49 event.set_flags(ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN); 49 event.set_flags(ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
50 event.set_unique_event_id(123456U); 50 event.set_unique_event_id(123456U);
51 51
52 WebTouchEvent expected_event; 52 WebTouchEvent expected_event(
53 expected_event.type = WebInputEvent::TouchStart; 53 WebInputEvent::TouchStart,
54 WebInputEvent::ShiftKey | WebInputEvent::AltKey,
55 (event.GetEventTime() - base::TimeTicks()).InSecondsF());
54 expected_event.touchesLength = 1; 56 expected_event.touchesLength = 1;
55 expected_event.timeStampSeconds =
56 (event.GetEventTime() - base::TimeTicks()).InSecondsF();
57 expected_event.modifiers = WebInputEvent::ShiftKey | WebInputEvent::AltKey;
58 WebTouchPoint expected_pointer; 57 WebTouchPoint expected_pointer;
59 expected_pointer.id = pointer.id; 58 expected_pointer.id = pointer.id;
60 expected_pointer.state = WebTouchPoint::StatePressed; 59 expected_pointer.state = WebTouchPoint::StatePressed;
61 expected_pointer.position = blink::WebFloatPoint(pointer.x, pointer.y); 60 expected_pointer.position = blink::WebFloatPoint(pointer.x, pointer.y);
62 expected_pointer.screenPosition = 61 expected_pointer.screenPosition =
63 blink::WebFloatPoint(pointer.raw_x, pointer.raw_y); 62 blink::WebFloatPoint(pointer.raw_x, pointer.raw_y);
64 expected_pointer.radiusX = pointer.touch_major / 2.f; 63 expected_pointer.radiusX = pointer.touch_major / 2.f;
65 expected_pointer.radiusY = pointer.touch_minor / 2.f; 64 expected_pointer.radiusY = pointer.touch_minor / 2.f;
66 expected_pointer.rotationAngle = 0.f; 65 expected_pointer.rotationAngle = 0.f;
67 expected_pointer.force = pointer.pressure; 66 expected_pointer.force = pointer.pressure;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 EXPECT_EQ(gfx::ToFlooredInt(pos.y()), web_event.y); 119 EXPECT_EQ(gfx::ToFlooredInt(pos.y()), web_event.y);
121 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.x()), web_event.globalX); 120 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.x()), web_event.globalX);
122 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.y()), web_event.globalY); 121 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.y()), web_event.globalY);
123 EXPECT_EQ(blink::WebGestureDeviceTouchscreen, web_event.sourceDevice); 122 EXPECT_EQ(blink::WebGestureDeviceTouchscreen, web_event.sourceDevice);
124 EXPECT_EQ(delta.x(), web_event.data.scrollUpdate.deltaX); 123 EXPECT_EQ(delta.x(), web_event.data.scrollUpdate.deltaX);
125 EXPECT_EQ(delta.y(), web_event.data.scrollUpdate.deltaY); 124 EXPECT_EQ(delta.y(), web_event.data.scrollUpdate.deltaY);
126 EXPECT_TRUE(web_event.data.scrollUpdate.previousUpdateInSequencePrevented); 125 EXPECT_TRUE(web_event.data.scrollUpdate.previousUpdateInSequencePrevented);
127 } 126 }
128 127
129 } // namespace content 128 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698