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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/render_widget_host_unittest.cc

Issue 304793003: use enum to specify deviceSource for fling animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed desired #include Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/input/web_input_event_util.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | content/child/blink_platform_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index d50287d75cbe2a41fed2918f592af32641f19ba1..dfa48348dbb5bfb99036047ea95fb72033d28fe8 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -718,15 +718,14 @@ class RenderWidgetHostTest : public testing::Test {
// Inject simple synthetic WebGestureEvent instances.
void SimulateGestureEvent(WebInputEvent::Type type,
- WebGestureEvent::SourceDevice sourceDevice) {
+ WebGestureDevice sourceDevice) {
SimulateGestureEventCore(
SyntheticWebGestureEventBuilder::Build(type, sourceDevice));
}
- void SimulateGestureEventWithLatencyInfo(
- WebInputEvent::Type type,
- WebGestureEvent::SourceDevice sourceDevice,
- const ui::LatencyInfo& ui_latency) {
+ void SimulateGestureEventWithLatencyInfo(WebInputEvent::Type type,
+ WebGestureDevice sourceDevice,
+ const ui::LatencyInfo& ui_latency) {
SimulateGestureEventCoreWithLatencyInfo(
SyntheticWebGestureEventBuilder::Build(type, sourceDevice),
ui_latency);
@@ -742,14 +741,13 @@ class RenderWidgetHostTest : public testing::Test {
float anchorY,
int modifiers) {
SimulateGestureEventCore(SyntheticWebGestureEventBuilder::BuildPinchUpdate(
- scale, anchorX, anchorY, modifiers, WebGestureEvent::Touchscreen));
+ scale, anchorX, anchorY, modifiers, blink::WebGestureDeviceTouchpad));
}
// Inject synthetic GestureFlingStart events.
- void SimulateGestureFlingStartEvent(
- float velocityX,
- float velocityY,
- WebGestureEvent::SourceDevice sourceDevice) {
+ void SimulateGestureFlingStartEvent(float velocityX,
+ float velocityY,
+ WebGestureDevice sourceDevice) {
SimulateGestureEventCore(
SyntheticWebGestureEventBuilder::BuildFling(velocityX,
velocityY,
@@ -815,8 +813,7 @@ class RenderWidgetHostTest : public testing::Test {
// This is for tests that are to be run for all source devices.
class RenderWidgetHostWithSourceTest
: public RenderWidgetHostTest,
- public testing::WithParamInterface<WebGestureEvent::SourceDevice> {
-};
+ public testing::WithParamInterface<WebGestureDevice> {};
#endif // GTEST_HAS_PARAM_TEST
} // namespace
@@ -1114,7 +1111,7 @@ TEST_F(RenderWidgetHostTest, HandleWheelEvent) {
TEST_F(RenderWidgetHostTest, UnhandledGestureEvent) {
SimulateGestureEvent(WebInputEvent::GestureTwoFingerTap,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
// Make sure we sent the input event to the renderer.
EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(
@@ -1297,7 +1294,7 @@ TEST_F(RenderWidgetHostTest, WheelScrollConsumedDoNotHorizOverscroll) {
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_mode());
// Indicate the end of the scrolling from the touchpad.
- SimulateGestureFlingStartEvent(-1200.f, 0.f, WebGestureEvent::Touchpad);
+ SimulateGestureFlingStartEvent(-1200.f, 0.f, blink::WebGestureDeviceTouchpad);
EXPECT_EQ(1U, process_->sink().message_count());
// Start another scroll. This time, do not consume any scroll events.
@@ -1428,7 +1425,7 @@ TEST_F(RenderWidgetHostTest, ScrollEventsOverscrollWithFling) {
// Send a fling start, but with a small velocity, so that the overscroll is
// aborted. The fling should proceed to the renderer, through the gesture
// event filter.
- SimulateGestureFlingStartEvent(0.f, 0.1f, WebGestureEvent::Touchpad);
+ SimulateGestureFlingStartEvent(0.f, 0.1f, blink::WebGestureDeviceTouchpad);
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_mode());
EXPECT_EQ(1U, host_->GestureEventLastQueueEventSize());
EXPECT_EQ(1U, process_->sink().message_count());
@@ -1475,7 +1472,7 @@ TEST_F(RenderWidgetHostTest, ScrollEventsOverscrollWithZeroFling) {
// Send a fling start, but with a small velocity, so that the overscroll is
// aborted. The fling should proceed to the renderer, through the gesture
// event filter.
- SimulateGestureFlingStartEvent(10.f, 0.f, WebGestureEvent::Touchpad);
+ SimulateGestureFlingStartEvent(10.f, 0.f, blink::WebGestureDeviceTouchpad);
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_mode());
EXPECT_EQ(1U, host_->GestureEventLastQueueEventSize());
EXPECT_EQ(1U, process_->sink().message_count());
@@ -1494,7 +1491,7 @@ TEST_F(RenderWidgetHostTest, ReverseFlingCancelsOverscroll) {
// gesture events in the renderer. This should initiate and complete an
// overscroll navigation.
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
SimulateGestureScrollUpdateEvent(300, -5, 0);
SendInputEventACK(WebInputEvent::GestureScrollUpdate,
INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
@@ -1503,7 +1500,7 @@ TEST_F(RenderWidgetHostTest, ReverseFlingCancelsOverscroll) {
process_->sink().ClearMessages();
SimulateGestureEvent(WebInputEvent::GestureScrollEnd,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(OVERSCROLL_EAST, host_->overscroll_delegate()->completed_mode());
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_delegate()->current_mode());
EXPECT_EQ(1U, process_->sink().message_count());
@@ -1516,7 +1513,7 @@ TEST_F(RenderWidgetHostTest, ReverseFlingCancelsOverscroll) {
// the fling in the opposite direction.
host_->overscroll_delegate()->Reset();
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
SimulateGestureScrollUpdateEvent(-300, -5, 0);
SendInputEventACK(WebInputEvent::GestureScrollUpdate,
INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
@@ -1524,7 +1521,7 @@ TEST_F(RenderWidgetHostTest, ReverseFlingCancelsOverscroll) {
EXPECT_EQ(OVERSCROLL_WEST, host_->overscroll_delegate()->current_mode());
process_->sink().ClearMessages();
- SimulateGestureFlingStartEvent(100, 0, WebGestureEvent::Touchscreen);
+ SimulateGestureFlingStartEvent(100, 0, blink::WebGestureDeviceTouchpad);
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_delegate()->completed_mode());
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_delegate()->current_mode());
EXPECT_EQ(1U, process_->sink().message_count());
@@ -1540,7 +1537,7 @@ TEST_F(RenderWidgetHostTest, GestureScrollOverscrolls) {
process_->sink().ClearMessages();
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_mode());
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_delegate()->current_mode());
@@ -1575,7 +1572,7 @@ TEST_F(RenderWidgetHostTest, GestureScrollOverscrolls) {
// the event to the renderer. The gesture-event filter should receive this
// event.
SimulateGestureEvent(WebInputEvent::GestureScrollEnd,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_mode());
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_delegate()->current_mode());
EXPECT_EQ(1U, process_->sink().message_count());
@@ -1593,7 +1590,7 @@ TEST_F(RenderWidgetHostTest, GestureScrollConsumedHorizontal) {
process_->sink().ClearMessages();
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
SimulateGestureScrollUpdateEvent(10, 0, 0);
// Start scrolling on content. ACK both events as being processed.
@@ -1623,7 +1620,7 @@ TEST_F(RenderWidgetHostTest, GestureScrollDebounceOverscrolls) {
// Start scrolling. Receive ACK as it being processed.
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(1U, process_->sink().message_count());
process_->sink().ClearMessages();
@@ -1638,13 +1635,13 @@ TEST_F(RenderWidgetHostTest, GestureScrollDebounceOverscrolls) {
// Quickly end and restart the scroll gesture. These two events should get
// discarded.
SimulateGestureEvent(WebInputEvent::GestureScrollEnd,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(0U, process_->sink().message_count());
EXPECT_EQ(1U, host_->GestureEventLastQueueEventSize());
EXPECT_EQ(1U, host_->GestureEventDebouncingQueueSize());
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(0U, process_->sink().message_count());
EXPECT_EQ(1U, host_->GestureEventLastQueueEventSize());
EXPECT_EQ(2U, host_->GestureEventDebouncingQueueSize());
@@ -1701,7 +1698,7 @@ TEST_F(RenderWidgetHostTest, GestureScrollDebounceTimerOverscroll) {
// Start scrolling. Receive ACK as it being processed.
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(1U, process_->sink().message_count());
process_->sink().ClearMessages();
@@ -1715,7 +1712,7 @@ TEST_F(RenderWidgetHostTest, GestureScrollDebounceTimerOverscroll) {
// Send an end event. This should get in the debounce queue.
SimulateGestureEvent(WebInputEvent::GestureScrollEnd,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(0U, process_->sink().message_count());
EXPECT_EQ(1U, host_->GestureEventLastQueueEventSize());
EXPECT_EQ(1U, host_->GestureEventDebouncingQueueSize());
@@ -1782,7 +1779,7 @@ TEST_F(RenderWidgetHostTest, OverscrollWithTouchEvents) {
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_delegate()->current_mode());
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
SimulateGestureScrollUpdateEvent(20, 0, 0);
SendInputEventACK(WebInputEvent::GestureScrollUpdate,
INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
@@ -1867,7 +1864,7 @@ TEST_F(RenderWidgetHostTest, OverscrollWithTouchEvents) {
EXPECT_TRUE(host_->TouchEventQueueEmpty());
SimulateGestureEvent(blink::WebInputEvent::GestureScrollEnd,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
base::MessageLoop::current()->PostDelayedTask(
FROM_HERE,
base::MessageLoop::QuitClosure(),
@@ -1892,7 +1889,7 @@ TEST_F(RenderWidgetHostTest, TouchGestureEndDispatchedAfterOverscrollComplete) {
// Start scrolling. Receive ACK as it being processed.
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(1U, process_->sink().message_count());
// The scroll begin event will have received a synthetic ack from the input
// router.
@@ -1925,7 +1922,7 @@ TEST_F(RenderWidgetHostTest, TouchGestureEndDispatchedAfterOverscrollComplete) {
// Send end event.
SimulateGestureEvent(blink::WebInputEvent::GestureScrollEnd,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(0U, process_->sink().message_count());
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_mode());
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_delegate()->current_mode());
@@ -1947,7 +1944,7 @@ TEST_F(RenderWidgetHostTest, TouchGestureEndDispatchedAfterOverscrollComplete) {
// Start scrolling. Receive ACK as it being processed.
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(1U, process_->sink().message_count());
// The scroll begin event will have received a synthetic ack from the input
// router.
@@ -1980,7 +1977,7 @@ TEST_F(RenderWidgetHostTest, TouchGestureEndDispatchedAfterOverscrollComplete) {
// Send end event.
SimulateGestureEvent(blink::WebInputEvent::GestureScrollEnd,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(0U, process_->sink().message_count());
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_mode());
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_delegate()->current_mode());
@@ -2009,7 +2006,7 @@ TEST_F(RenderWidgetHostTest, OverscrollDirectionChange) {
// Start scrolling. Receive ACK as it being processed.
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(1U, process_->sink().message_count());
process_->sink().ClearMessages();
@@ -2095,7 +2092,7 @@ TEST_F(RenderWidgetHostTest, OverscrollMouseMoveCompletion) {
// Now try with gestures.
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
SimulateGestureScrollUpdateEvent(300, -5, 0);
SendInputEventACK(WebInputEvent::GestureScrollUpdate,
INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
@@ -2116,7 +2113,7 @@ TEST_F(RenderWidgetHostTest, OverscrollMouseMoveCompletion) {
INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
SimulateGestureEvent(WebInputEvent::GestureScrollEnd,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_delegate()->current_mode());
EXPECT_EQ(1U, process_->sink().message_count());
process_->sink().ClearMessages();
@@ -2160,7 +2157,7 @@ TEST_F(RenderWidgetHostTest, OverscrollStateResetsAfterScroll) {
// Touchpad scroll can end with a zero-velocity fling. But it is not
// dispatched, but it should still reset the overscroll controller state.
- SimulateGestureFlingStartEvent(0.f, 0.f, WebGestureEvent::Touchpad);
+ SimulateGestureFlingStartEvent(0.f, 0.f, blink::WebGestureDeviceTouchpad);
EXPECT_TRUE(host_->ScrollStateIsUnknown());
EXPECT_EQ(0U, process_->sink().message_count());
@@ -2185,7 +2182,7 @@ TEST_F(RenderWidgetHostTest, OverscrollStateResetsAfterScroll) {
EXPECT_TRUE(host_->ScrollStateIsOverscrolling());
EXPECT_EQ(0U, process_->sink().message_count());
- SimulateGestureFlingStartEvent(0.f, 0.f, WebGestureEvent::Touchpad);
+ SimulateGestureFlingStartEvent(0.f, 0.f, blink::WebGestureDeviceTouchpad);
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_mode());
EXPECT_EQ(OVERSCROLL_WEST, host_->overscroll_delegate()->completed_mode());
EXPECT_TRUE(host_->ScrollStateIsUnknown());
@@ -2202,7 +2199,7 @@ TEST_F(RenderWidgetHostTest, OverscrollResetsOnBlur) {
// Start an overscroll with gesture scroll. In the middle of the scroll, blur
// the host.
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
SimulateGestureScrollUpdateEvent(300, -5, 0);
SendInputEventACK(WebInputEvent::GestureScrollUpdate,
INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
@@ -2219,14 +2216,14 @@ TEST_F(RenderWidgetHostTest, OverscrollResetsOnBlur) {
process_->sink().ClearMessages();
SimulateGestureEvent(WebInputEvent::GestureScrollEnd,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(1U, process_->sink().message_count());
process_->sink().ClearMessages();
// Start a scroll gesture again. This should correctly start the overscroll
// after the threshold.
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
SimulateGestureScrollUpdateEvent(300, -5, 0);
SendInputEventACK(WebInputEvent::GestureScrollUpdate,
INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
@@ -2235,7 +2232,7 @@ TEST_F(RenderWidgetHostTest, OverscrollResetsOnBlur) {
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_delegate()->completed_mode());
SimulateGestureEvent(WebInputEvent::GestureScrollEnd,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_delegate()->current_mode());
EXPECT_EQ(OVERSCROLL_EAST, host_->overscroll_delegate()->completed_mode());
EXPECT_EQ(3U, process_->sink().message_count());
@@ -2468,7 +2465,7 @@ TEST_F(RenderWidgetHostTest, IgnoreInputEvent) {
EXPECT_FALSE(host_->mock_input_router()->sent_wheel_event_);
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
EXPECT_FALSE(host_->mock_input_router()->sent_gesture_event_);
PressTouchPoint(100, 100);
@@ -2619,13 +2616,13 @@ TEST_F(RenderWidgetHostTest, InputEventRWHLatencyComponent) {
// Tests RWHI::ForwardGestureEvent().
SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
CheckLatencyInfoComponentInMessage(
process_, GetLatencyComponentId(), WebInputEvent::GestureScrollBegin);
// Tests RWHI::ForwardGestureEventWithLatencyInfo().
SimulateGestureEventWithLatencyInfo(WebInputEvent::GestureScrollUpdate,
- WebGestureEvent::Touchscreen,
+ blink::WebGestureDeviceTouchpad,
ui::LatencyInfo());
CheckLatencyInfoComponentInMessage(
process_, GetLatencyComponentId(), WebInputEvent::GestureScrollUpdate);
« no previous file with comments | « content/browser/renderer_host/input/web_input_event_util.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | content/child/blink_platform_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698