content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc - Issue 2227563003: Refactoring button field and its type

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc

Issue 2227563003: Refactoring button field and its type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix mac/win errors 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/input/main_thread_event_queue_browsertest.cc ('k') | content/browser/renderer_host/input/synthetic_gesture_target_aura.cc » ('j') | third_party/WebKit/Source/core/events/PointerEventFactory.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc

diff --git a/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc b/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc

index 543cfdc9ae6a3fbcdd3fd2c417c717cee3d51692..c2e16707f9d306ef4a0bc8f65fe4e4fdb2882557 100644

--- a/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc

+++ b/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc

@@ -206,14 +206,14 @@ class MockDragMouseTarget : public MockMoveGestureTarget {

ASSERT_TRUE(WebInputEvent::isMouseEventType(event.type));

const WebMouseEvent& mouse_event = static_cast<const WebMouseEvent&>(event);

if (!started_) {

- EXPECT_EQ(mouse_event.button, WebMouseEvent::ButtonLeft);

+ EXPECT_EQ(mouse_event.button, WebMouseEvent::Button::Left);

EXPECT_EQ(mouse_event.clickCount, 1);

EXPECT_EQ(mouse_event.type, WebInputEvent::MouseDown);

start_.SetPoint(mouse_event.x, mouse_event.y);

last_mouse_point_ = start_;

started_ = true;

} else {

- EXPECT_EQ(mouse_event.button, WebMouseEvent::ButtonLeft);

+ EXPECT_EQ(mouse_event.button, WebMouseEvent::Button::Left);

ASSERT_NE(mouse_event.type, WebInputEvent::MouseDown);

gfx::PointF mouse_point(mouse_event.x, mouse_event.y);

@@ -450,7 +450,7 @@ class MockSyntheticTapMouseTarget : public MockSyntheticTapGestureTarget {

switch (state_) {

case NOT_STARTED:

EXPECT_EQ(mouse_event.type, WebInputEvent::MouseDown);

- EXPECT_EQ(mouse_event.button, WebMouseEvent::ButtonLeft);

+ EXPECT_EQ(mouse_event.button, WebMouseEvent::Button::Left);

EXPECT_EQ(mouse_event.clickCount, 1);

position_ = gfx::PointF(mouse_event.x, mouse_event.y);

start_time_ = base::TimeDelta::FromMilliseconds(

@@ -459,7 +459,7 @@ class MockSyntheticTapMouseTarget : public MockSyntheticTapGestureTarget {

break;

case STARTED:

EXPECT_EQ(mouse_event.type, WebInputEvent::MouseUp);

- EXPECT_EQ(mouse_event.button, WebMouseEvent::ButtonLeft);

+ EXPECT_EQ(mouse_event.button, WebMouseEvent::Button::Left);

EXPECT_EQ(mouse_event.clickCount, 1);

EXPECT_EQ(position_, gfx::PointF(mouse_event.x, mouse_event.y));

stop_time_ = base::TimeDelta::FromMilliseconds(

@@ -1474,4 +1474,4 @@ TEST_F(SyntheticGestureControllerTest, TapGestureMouse) {

} // namespace

-} // namespace content

+} // namespace content