third_party/WebKit/Source/core/html/track/TextTrack.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

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/TextTrack.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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/track/TextTrack.h ('k') | third_party/WebKit/Source/core/html/track/TextTrackList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2f122e2ff52cf14d9748a45050f718eb89fed7d1..9cdcaf28748dca09798bd643ca72a4c90348001d 100644

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

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

@@ -448,10 +448,10 @@ const AtomicString& TextTrack::interfaceName() const

return EventTargetNames::TextTrack;

}

-ExecutionContext* TextTrack::executionContext() const

+ExecutionContext* TextTrack::getExecutionContext() const

{

HTMLMediaElement* owner = mediaElement();

- return owner ? owner->executionContext() : 0;

+ return owner ? owner->getExecutionContext() : 0;

}

HTMLMediaElement* TextTrack::mediaElement() const

« no previous file with comments | « third_party/WebKit/Source/core/html/track/TextTrack.h ('k') | third_party/WebKit/Source/core/html/track/TextTrackList.h » ('j') | no next file with comments »