third_party/WebKit/Source/core/input/EventHandler.cpp - Issue 1738623004: Rename enums/functions that collide in chromium style.

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/core/input/EventHandler.cpp

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4

Patch Set: get-names-5: rebase-and-stuff 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

« no previous file with comments | « third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/input/EventHandler.cpp

diff --git a/third_party/WebKit/Source/core/input/EventHandler.cpp b/third_party/WebKit/Source/core/input/EventHandler.cpp

index 81e9c4711a67f2595fe4b3b9fc08609d8f820327..a5b46c787dcb2f423b9d8eeeb0dc451b066695e3 100644

--- a/third_party/WebKit/Source/core/input/EventHandler.cpp

+++ b/third_party/WebKit/Source/core/input/EventHandler.cpp

@@ -1732,8 +1732,8 @@ namespace {

ScrollResult scrollAreaWithWheelEvent(const PlatformWheelEvent& event, ScrollableArea& scrollableArea)

{

- float deltaX = event.railsMode() != PlatformEvent::RailsModeVertical ? event.deltaX() : 0;

- float deltaY = event.railsMode() != PlatformEvent::RailsModeHorizontal ? event.deltaY() : 0;

+ float deltaX = event.getRailsMode() != PlatformEvent::RailsModeVertical ? event.deltaX() : 0;

+ float deltaY = event.getRailsMode() != PlatformEvent::RailsModeHorizontal ? event.deltaY() : 0;

ScrollGranularity granularity =

event.granularity() == ScrollByPixelWheelEvent ? ScrollByPixel : ScrollByPage;

@@ -1851,11 +1851,11 @@ void EventHandler::defaultWheelEventHandler(Node* startNode, WheelEvent* wheelEv

// a MacBook pro is an example of a 2-dimensional mouse wheel event (where both deltaX and deltaY can be set).

// FIXME: enable scroll customization in this case. See crbug.com/410974.

- if (wheelEvent->railsMode() != Event::RailsModeVertical

+ if (wheelEvent->getRailsMode() != Event::RailsModeVertical

&& scroll(ScrollRightIgnoringWritingMode, granularity, startNode, &stopNode, wheelEvent->deltaX()).didScroll)

wheelEvent->setDefaultHandled();

- if (wheelEvent->railsMode() != Event::RailsModeHorizontal

+ if (wheelEvent->getRailsMode() != Event::RailsModeHorizontal

&& scroll(ScrollDownIgnoringWritingMode, granularity, startNode, &stopNode, wheelEvent->deltaY()).didScroll)

wheelEvent->setDefaultHandled();