third_party/WebKit/Source/core/html/HTMLMediaElement.h - 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/HTMLMediaElement.h

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/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 5f22ef0d8d3ac51e6932f75e7a28498826335270..a388248f7b0af7f36ee046fe4c90a29a5e92079c 100644

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

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

@@ -203,7 +203,7 @@ public:

// causes an ambiguity error at compile time. This class's constructor

// ensures that both implementations return document, so return the result

// of one of them here.

- using HTMLElement::executionContext;

+ using HTMLElement::getExecutionContext;

bool hasSingleSecurityOrigin() const { return webMediaPlayer() && webMediaPlayer()->hasSingleSecurityOrigin(); }

@@ -236,7 +236,7 @@ public:

AudioSourceProviderClient* audioSourceNode() { return m_audioSourceNode; }

void setAudioSourceNode(AudioSourceProviderClient*);

- AudioSourceProvider& audioSourceProvider() { return m_audioSourceProvider; }

+ AudioSourceProvider& getAudioSourceProvider() { return m_audioSourceProvider; }

enum InvalidURLAction { DoNothing, Complain };

bool isSafeToLoadURL(const KURL&, InvalidURLAction);