third_party/WebKit/public/platform/WebMediaPlayer.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/public/platform/WebMediaPlayer.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

Index: third_party/WebKit/public/platform/WebMediaPlayer.h

diff --git a/third_party/WebKit/public/platform/WebMediaPlayer.h b/third_party/WebKit/public/platform/WebMediaPlayer.h

index b3739b4d37490bb4e5779c7becf07962a999f0ca..aebc99805ff3ed1cb0188f33d0bc0df5576f9e72 100644

--- a/third_party/WebKit/public/platform/WebMediaPlayer.h

+++ b/third_party/WebKit/public/platform/WebMediaPlayer.h

@@ -143,8 +143,8 @@ public:

virtual double currentTime() const = 0;

// Internal states of loading and network.

- virtual NetworkState networkState() const = 0;

- virtual ReadyState readyState() const = 0;

+ virtual NetworkState getNetworkState() const = 0;

+ virtual ReadyState getReadyState() const = 0;

virtual bool didLoadingProgress() = 0;

« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutVideo.cpp ('k') | no next file » | no next file with comments »