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

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/editing/commands/TypingCommand.cpp ('k') | third_party/WebKit/Source/core/events/MessageEvent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/events/EventListener.h

diff --git a/third_party/WebKit/Source/core/events/EventListener.h b/third_party/WebKit/Source/core/events/EventListener.h

index d7b46a83296e7d7398b83af06bdba0a04f1fd561..b2bb559a2fd665d0a92c99841fe9a126dedbb8db 100644

--- a/third_party/WebKit/Source/core/events/EventListener.h

+++ b/third_party/WebKit/Source/core/events/EventListener.h

@@ -33,7 +33,7 @@ class ExecutionContext;

class CORE_EXPORT EventListener : public RefCountedWillBeGarbageCollectedFinalized<EventListener> {

public:

- enum Type {

+ enum ListenerType {

JSEventListenerType,

ImageEventListenerType,

CPPEventListenerType,

@@ -49,12 +49,12 @@ public:

virtual bool belongsToTheCurrentWorld() const { return false; }

bool isAttribute() const { return virtualisAttribute(); }

- Type type() const { return m_type; }

+ ListenerType type() const { return m_type; }

DEFINE_INLINE_VIRTUAL_TRACE() { }

protected:

- explicit EventListener(Type type)

+ explicit EventListener(ListenerType type)

: m_type(type)

{

}

@@ -62,7 +62,7 @@ protected:

private:

virtual bool virtualisAttribute() const { return false; }

- Type m_type;

+ ListenerType m_type;

};

} // namespace blink