third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp - Issue 1746283002: Rename enums/functions that collide in chromium style in platform/

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: third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get-names-13-platform: . Created 4 years, 10 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

Index: third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp

diff --git a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp

index 611297d56e216de946d57a25743daddb547fcfee..2ea1b7703c6df6f3f6f078c862d4f3d85bd16d1e 100644

--- a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp

+++ b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp

@@ -940,7 +940,7 @@ TEST(WebInputEventConversionTest, PlatformWheelEventBuilder)

EXPECT_EQ(5, platformWheelBuilder.position().y());

EXPECT_EQ(10, platformWheelBuilder.deltaX());

EXPECT_EQ(15, platformWheelBuilder.deltaY());

- EXPECT_EQ(PlatformEvent::CtrlKey, platformWheelBuilder.modifiers());

+ EXPECT_EQ(PlatformEvent::CtrlKey, platformWheelBuilder.getModifiers());

EXPECT_TRUE(platformWheelBuilder.hasPreciseScrollingDeltas());

EXPECT_TRUE(platformWheelBuilder.canScroll());

EXPECT_EQ(platformWheelBuilder.getRailsMode(), PlatformEvent::RailsModeHorizontal);

@@ -963,7 +963,7 @@ TEST(WebInputEventConversionTest, PlatformWheelEventBuilder)

EXPECT_EQ(0, platformWheelBuilder.position().y());

EXPECT_EQ(15, platformWheelBuilder.deltaX());

EXPECT_EQ(10, platformWheelBuilder.deltaY());

- EXPECT_EQ(PlatformEvent::ShiftKey, platformWheelBuilder.modifiers());

+ EXPECT_EQ(PlatformEvent::ShiftKey, platformWheelBuilder.getModifiers());

EXPECT_FALSE(platformWheelBuilder.hasPreciseScrollingDeltas());

EXPECT_FALSE(platformWheelBuilder.canScroll());

EXPECT_EQ(platformWheelBuilder.getRailsMode(), PlatformEvent::RailsModeFree);

@@ -986,7 +986,7 @@ TEST(WebInputEventConversionTest, PlatformWheelEventBuilder)

EXPECT_EQ(0, platformWheelBuilder.position().y());

EXPECT_EQ(15, platformWheelBuilder.deltaX());

EXPECT_EQ(10, platformWheelBuilder.deltaY());

- EXPECT_EQ(PlatformEvent::AltKey, platformWheelBuilder.modifiers());

+ EXPECT_EQ(PlatformEvent::AltKey, platformWheelBuilder.getModifiers());

EXPECT_TRUE(platformWheelBuilder.hasPreciseScrollingDeltas());

EXPECT_FALSE(platformWheelBuilder.canScroll());

EXPECT_EQ(platformWheelBuilder.getRailsMode(), PlatformEvent::RailsModeVertical);

« no previous file with comments | « third_party/WebKit/Source/web/tests/WebFrameTest.cpp ('k') | no next file » | no next file with comments »