third_party/WebKit/Source/platform/PlatformTouchPoint.h - 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/platform/PlatformTouchPoint.h

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/platform/PlatformMouseEvent.h ('k') | third_party/WebKit/Source/platform/animation/TimingFunction.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/PlatformTouchPoint.h

diff --git a/third_party/WebKit/Source/platform/PlatformTouchPoint.h b/third_party/WebKit/Source/platform/PlatformTouchPoint.h

index b9071f1534b93d731d72dfe5655f0edb45c42e19..d9d37f44cf921a188fe106517efe747eaa999910 100644

--- a/third_party/WebKit/Source/platform/PlatformTouchPoint.h

+++ b/third_party/WebKit/Source/platform/PlatformTouchPoint.h

@@ -27,7 +27,7 @@ namespace blink {

class PlatformTouchPoint {

public:

- enum State {

+ enum TouchState {

TouchReleased,

TouchPressed,

TouchMoved,

@@ -44,7 +44,7 @@ public:

const WebPointerProperties& pointerProperties() const { return m_pointerProperties; }

int id() const { return pointerProperties().id; }

- State state() const { return m_state; }

+ TouchState state() const { return m_state; }

FloatPoint screenPos() const { return m_screenPos; }

FloatPoint pos() const { return m_pos; }

FloatSize radius() const { return m_radius; }

@@ -54,7 +54,7 @@ public:

protected:

WebPointerProperties m_pointerProperties;

- State m_state;

+ TouchState m_state;

FloatPoint m_screenPos;

FloatPoint m_pos;

FloatSize m_radius;