third_party/WebKit/Source/core/html/track/CueTimeline.cpp - 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/track/CueTimeline.cpp

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/shadow/SpinButtonElement.h ('k') | third_party/WebKit/Source/core/html/track/LoadableTextTrack.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/track/CueTimeline.cpp

diff --git a/third_party/WebKit/Source/core/html/track/CueTimeline.cpp b/third_party/WebKit/Source/core/html/track/CueTimeline.cpp

index f0820b54dc20bb1b813fedfdfd6269fdccf50d66..72e2fa7a71ad55ec57abfe7e7431792fbcfa41c0 100644

--- a/third_party/WebKit/Source/core/html/track/CueTimeline.cpp

+++ b/third_party/WebKit/Source/core/html/track/CueTimeline.cpp

@@ -150,7 +150,7 @@ void CueTimeline::updateActiveCues(double movieTime)

// The user agent must synchronously unset [the text track cue active] flag

// whenever ... the media element's readyState is changed back to HAVE_NOTHING.

- if (mediaElement.readyState() != HTMLMediaElement::HAVE_NOTHING && mediaElement.webMediaPlayer())

+ if (mediaElement.getReadyState() != HTMLMediaElement::HAVE_NOTHING && mediaElement.webMediaPlayer())

currentCues = m_cueTree.allOverlaps(m_cueTree.createInterval(movieTime, movieTime));

CueList previousCues;