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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

Issue 2914393002: Adding phase info to wheel events migrated to wheel phase handler class. (Closed)
Patch Set: fixed mouse_wheel_phase_handler_path in rwhv_mac Created 3 years, 6 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <tuple> 10 #include <tuple>
(...skipping 1786 matching lines...) Expand 10 before | Expand all | Expand 10 after
1797 1797
1798 input_event = GetInputEventFromMessage(*sink_->GetMessageAt(1)); 1798 input_event = GetInputEventFromMessage(*sink_->GetMessageAt(1));
1799 gesture_event = static_cast<const WebGestureEvent*>(input_event); 1799 gesture_event = static_cast<const WebGestureEvent*>(input_event);
1800 EXPECT_EQ(WebInputEvent::kGestureScrollUpdate, gesture_event->GetType()); 1800 EXPECT_EQ(WebInputEvent::kGestureScrollUpdate, gesture_event->GetType());
1801 EXPECT_EQ(0U, gesture_event->data.scroll_update.delta_x); 1801 EXPECT_EQ(0U, gesture_event->data.scroll_update.delta_x);
1802 EXPECT_EQ(2U, gesture_event->data.scroll_update.delta_y); 1802 EXPECT_EQ(2U, gesture_event->data.scroll_update.delta_y);
1803 SendInputEventACK(WebInputEvent::kGestureScrollUpdate, 1803 SendInputEventACK(WebInputEvent::kGestureScrollUpdate,
1804 INPUT_EVENT_ACK_STATE_CONSUMED); 1804 INPUT_EVENT_ACK_STATE_CONSUMED);
1805 sink_->ClearMessages(); 1805 sink_->ClearMessages();
1806 1806
1807 // Let the RenderWidgetHostViewEventHandler::mouse_wheel_phase_timer_ fire. A 1807 // Let the MouseWheelPhaseHandler::mouse_wheel_end_dispatch_timer_ fire. A
1808 // synthetic wheel event with zero deltas and kPhaseEnded will be sent. 1808 // synthetic wheel event with zero deltas and kPhaseEnded will be sent.
1809 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( 1809 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
1810 FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(), 1810 FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
1811 base::TimeDelta::FromMilliseconds( 1811 base::TimeDelta::FromMilliseconds(
1812 kDefaultMouseWheelLatchingTransactionMs)); 1812 kDefaultMouseWheelLatchingTransactionMs));
1813 base::RunLoop().Run(); 1813 base::RunLoop().Run();
1814 1814
1815 input_event = GetInputEventFromMessage(*sink_->GetMessageAt(0)); 1815 input_event = GetInputEventFromMessage(*sink_->GetMessageAt(0));
1816 wheel_event = static_cast<const WebMouseWheelEvent*>(input_event); 1816 wheel_event = static_cast<const WebMouseWheelEvent*>(input_event);
1817 EXPECT_EQ(WebMouseWheelEvent::kPhaseEnded, wheel_event->phase); 1817 EXPECT_EQ(WebMouseWheelEvent::kPhaseEnded, wheel_event->phase);
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
1859 ui::ScrollEvent fling_start(ui::ET_SCROLL_FLING_START, gfx::Point(2, 2), 1859 ui::ScrollEvent fling_start(ui::ET_SCROLL_FLING_START, gfx::Point(2, 2),
1860 ui::EventTimeForNow(), 0, 0, 10, 0, 10, 2); 1860 ui::EventTimeForNow(), 0, 0, 10, 0, 10, 2);
1861 view_->OnScrollEvent(&fling_start); 1861 view_->OnScrollEvent(&fling_start);
1862 input_event = GetInputEventFromMessage(*sink_->GetMessageAt(0)); 1862 input_event = GetInputEventFromMessage(*sink_->GetMessageAt(0));
1863 gesture_event = static_cast<const WebGestureEvent*>(input_event); 1863 gesture_event = static_cast<const WebGestureEvent*>(input_event);
1864 EXPECT_EQ(WebInputEvent::kGestureFlingStart, gesture_event->GetType()); 1864 EXPECT_EQ(WebInputEvent::kGestureFlingStart, gesture_event->GetType());
1865 SendInputEventACK(WebInputEvent::kGestureFlingStart, 1865 SendInputEventACK(WebInputEvent::kGestureFlingStart,
1866 INPUT_EVENT_ACK_STATE_CONSUMED); 1866 INPUT_EVENT_ACK_STATE_CONSUMED);
1867 sink_->ClearMessages(); 1867 sink_->ClearMessages();
1868 1868
1869 // Let the RenderWidgetHostViewEventHandler::mouse_wheel_phase_timer_ fire. No 1869 // Let the MouseWheelPhaseHandler::mouse_wheel_end_dispatch_timer_ fire. No
1870 // synthetic wheel event will be sent since the timer has stopped. 1870 // synthetic wheel event will be sent since the timer has stopped.
1871 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( 1871 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
1872 FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(), 1872 FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
1873 base::TimeDelta::FromMilliseconds( 1873 base::TimeDelta::FromMilliseconds(
1874 kDefaultMouseWheelLatchingTransactionMs)); 1874 kDefaultMouseWheelLatchingTransactionMs));
1875 base::RunLoop().Run(); 1875 base::RunLoop().Run();
1876 1876
1877 EXPECT_EQ(0U, sink_->message_count()); 1877 EXPECT_EQ(0U, sink_->message_count());
1878 1878
1879 // Handling the next ui::ET_SCROLL event will send a fling cancellation and a 1879 // Handling the next ui::ET_SCROLL event will send a fling cancellation and a
(...skipping 3952 matching lines...) Expand 10 before | Expand all | Expand 10 after
5832 // There is no composition in the beginning. 5832 // There is no composition in the beginning.
5833 EXPECT_FALSE(has_composition_text()); 5833 EXPECT_FALSE(has_composition_text());
5834 SetHasCompositionTextToTrue(); 5834 SetHasCompositionTextToTrue();
5835 view->ImeCancelComposition(); 5835 view->ImeCancelComposition();
5836 // The composition must have been canceled. 5836 // The composition must have been canceled.
5837 EXPECT_FALSE(has_composition_text()); 5837 EXPECT_FALSE(has_composition_text());
5838 } 5838 }
5839 } 5839 }
5840 5840
5841 } // namespace content 5841 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698