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

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

Issue 2240983003: Move |ScopedWebInputEvent| and |WebInputEventTraits| from |content::| to "ui/events/blink" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and ncarter's review Created 4 years, 4 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>
11 11
12 #include <cmath> 12 #include <cmath>
13 13
14 #include "content/browser/renderer_host/input/web_input_event_util.h" 14 #include "content/browser/renderer_host/input/web_input_event_util.h"
15 #include "content/common/input/synthetic_web_input_event_builders.h" 15 #include "content/common/input/synthetic_web_input_event_builders.h"
16 #include "content/common/input/web_input_event_traits.h"
17 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
18 #include "ui/events/blink/blink_event_util.h" 17 #include "ui/events/blink/blink_event_util.h"
18 #include "ui/events/blink/web_input_event_traits.h"
19 #include "ui/events/event_constants.h" 19 #include "ui/events/event_constants.h"
20 #include "ui/events/gesture_detection/gesture_event_data.h" 20 #include "ui/events/gesture_detection/gesture_event_data.h"
21 #include "ui/events/gesture_detection/motion_event_generic.h" 21 #include "ui/events/gesture_detection/motion_event_generic.h"
22 #include "ui/events/gesture_event_details.h" 22 #include "ui/events/gesture_event_details.h"
23 #include "ui/gfx/geometry/safe_integer_conversions.h" 23 #include "ui/gfx/geometry/safe_integer_conversions.h"
24 24
25 using blink::WebInputEvent; 25 using blink::WebInputEvent;
26 using blink::WebTouchEvent; 26 using blink::WebTouchEvent;
27 using blink::WebTouchPoint; 27 using blink::WebTouchPoint;
28 using ui::MotionEvent; 28 using ui::MotionEvent;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 expected_pointer.tiltY = 0; 71 expected_pointer.tiltY = 0;
72 } else { 72 } else {
73 expected_pointer.tiltX = 0; 73 expected_pointer.tiltX = 0;
74 expected_pointer.tiltY = 0; 74 expected_pointer.tiltY = 0;
75 } 75 }
76 expected_event.touches[0] = expected_pointer; 76 expected_event.touches[0] = expected_pointer;
77 expected_event.uniqueTouchEventId = 123456U; 77 expected_event.uniqueTouchEventId = 123456U;
78 78
79 WebTouchEvent actual_event = 79 WebTouchEvent actual_event =
80 ui::CreateWebTouchEventFromMotionEvent(event, false); 80 ui::CreateWebTouchEventFromMotionEvent(event, false);
81 EXPECT_EQ(WebInputEventTraits::ToString(expected_event), 81 EXPECT_EQ(ui::WebInputEventTraits::ToString(expected_event),
82 WebInputEventTraits::ToString(actual_event)); 82 ui::WebInputEventTraits::ToString(actual_event));
83 } 83 }
84 } 84 }
85 85
86 TEST(WebInputEventUtilTest, ScrollUpdateConversion) { 86 TEST(WebInputEventUtilTest, ScrollUpdateConversion) {
87 int motion_event_id = 0; 87 int motion_event_id = 0;
88 MotionEvent::ToolType tool_type = MotionEvent::TOOL_TYPE_UNKNOWN; 88 MotionEvent::ToolType tool_type = MotionEvent::TOOL_TYPE_UNKNOWN;
89 base::TimeTicks timestamp = base::TimeTicks::Now(); 89 base::TimeTicks timestamp = base::TimeTicks::Now();
90 gfx::Vector2dF delta(-5.f, 10.f); 90 gfx::Vector2dF delta(-5.f, 10.f);
91 gfx::PointF pos(1.f, 2.f); 91 gfx::PointF pos(1.f, 2.f);
92 gfx::PointF raw_pos(11.f, 12.f); 92 gfx::PointF raw_pos(11.f, 12.f);
(...skipping 28 matching lines...) Expand all
121 EXPECT_EQ(gfx::ToFlooredInt(pos.y()), web_event.y); 121 EXPECT_EQ(gfx::ToFlooredInt(pos.y()), web_event.y);
122 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.x()), web_event.globalX); 122 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.x()), web_event.globalX);
123 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.y()), web_event.globalY); 123 EXPECT_EQ(gfx::ToFlooredInt(raw_pos.y()), web_event.globalY);
124 EXPECT_EQ(blink::WebGestureDeviceTouchscreen, web_event.sourceDevice); 124 EXPECT_EQ(blink::WebGestureDeviceTouchscreen, web_event.sourceDevice);
125 EXPECT_EQ(delta.x(), web_event.data.scrollUpdate.deltaX); 125 EXPECT_EQ(delta.x(), web_event.data.scrollUpdate.deltaX);
126 EXPECT_EQ(delta.y(), web_event.data.scrollUpdate.deltaY); 126 EXPECT_EQ(delta.y(), web_event.data.scrollUpdate.deltaY);
127 EXPECT_TRUE(web_event.data.scrollUpdate.previousUpdateInSequencePrevented); 127 EXPECT_TRUE(web_event.data.scrollUpdate.previousUpdateInSequencePrevented);
128 } 128 }
129 129
130 } // namespace content 130 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698