third_party/WebKit/Source/core/events/PointerEventFactory.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/core/events/PointerEventFactory.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

« no previous file with comments | « third_party/WebKit/Source/core/events/MouseEvent.cpp ('k') | third_party/WebKit/Source/core/events/PointerEventFactoryTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/events/PointerEventFactory.cpp

diff --git a/third_party/WebKit/Source/core/events/PointerEventFactory.cpp b/third_party/WebKit/Source/core/events/PointerEventFactory.cpp

index a7716388383649708272f71e721d920a30048ba1..5c51a0714d510fc6ccefa7a52828e7b9a7f8eec3 100644

--- a/third_party/WebKit/Source/core/events/PointerEventFactory.cpp

+++ b/third_party/WebKit/Source/core/events/PointerEventFactory.cpp

@@ -81,7 +81,7 @@ PassRefPtrWillBeRawPtr<PointerEvent> PointerEventFactory::create(

PassRefPtrWillBeRawPtr<AbstractView> view)

{

AtomicString pointerEventName = pointerEventNameForMouseEventName(mouseEventName);

- unsigned buttons = MouseEvent::platformModifiersToButtons(mouseEvent.modifiers());

+ unsigned buttons = MouseEvent::platformModifiersToButtons(mouseEvent.getModifiers());

PointerEventInit pointerEventInit;

setIdTypeButtons(pointerEventInit, mouseEvent.pointerProperties(), buttons);

@@ -101,7 +101,7 @@ PassRefPtrWillBeRawPtr<PointerEvent> PointerEventFactory::create(

pointerEventInit.setPressure(getPointerEventPressure(

mouseEvent.pointerProperties().force, pointerEventInit.buttons()));

- UIEventWithKeyState::setFromPlatformModifiers(pointerEventInit, mouseEvent.modifiers());

+ UIEventWithKeyState::setFromPlatformModifiers(pointerEventInit, mouseEvent.getModifiers());

// Make sure chorded buttons fire pointermove instead of pointerup/down.

if ((pointerEventName == EventTypeNames::pointerdown

@@ -129,7 +129,7 @@ PassRefPtrWillBeRawPtr<PointerEvent> PointerEventFactory::create(const AtomicStr

const double width, const double height,

const double clientX, const double clientY)

{

- const PlatformTouchPoint::State pointState = touchPoint.state();

+ const PlatformTouchPoint::TouchState pointState = touchPoint.state();

bool pointerReleasedOrCancelled =

pointState == PlatformTouchPoint::TouchReleased