third_party/WebKit/Source/core/html/HTMLMediaElement.h - Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/.

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/html/HTMLMediaElement.h

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

Patch Set: get-names-6: . 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/HTMLLinkElement.cpp ('k') | third_party/WebKit/Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLMediaElement.h

diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.h b/third_party/WebKit/Source/core/html/HTMLMediaElement.h

index f2a10fc43c5f45dad599ea9394c6a7e6b8699cc8..d922e17663329c83ae765be9562ac9d3e29f053c 100644

--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h

+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h

@@ -123,7 +123,7 @@ public:

// ready state

enum ReadyState { HAVE_NOTHING, HAVE_METADATA, HAVE_CURRENT_DATA, HAVE_FUTURE_DATA, HAVE_ENOUGH_DATA };

- ReadyState readyState() const;

+ ReadyState getReadyState() const;

bool seeking() const;

// playback state

@@ -275,7 +275,7 @@ protected:

virtual KURL posterImageURL() const { return KURL(); }

enum DisplayMode { Unknown, Poster, Video };

- DisplayMode displayMode() const { return m_displayMode; }

+ DisplayMode getDisplayMode() const { return m_displayMode; }

virtual void setDisplayMode(DisplayMode mode) { m_displayMode = mode; }

private: