third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.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/modules/encryptedmedia/MediaKeySession.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/modules/encryptedmedia/MediaKeySession.h ('k') | third_party/WebKit/Source/modules/encryptedmedia/MediaKeySystemAccess.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

index f58d99da923e3fbbba762d0ec30bf740a3dde580..1b6901020b95784ea0b2d002813feca3b9e2fbc2 100644

--- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

+++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

@@ -308,7 +308,7 @@ MediaKeySession* MediaKeySession::create(ScriptState* scriptState, MediaKeys* me

}

MediaKeySession::MediaKeySession(ScriptState* scriptState, MediaKeys* mediaKeys, WebEncryptedMediaSessionType sessionType)

- : ActiveDOMObject(scriptState->executionContext())

+ : ActiveDOMObject(scriptState->getExecutionContext())

, m_asyncEventQueue(GenericEventQueue::create(this))

, m_mediaKeys(mediaKeys)

, m_sessionType(sessionType)

@@ -317,7 +317,7 @@ MediaKeySession::MediaKeySession(ScriptState* scriptState, MediaKeys* mediaKeys,

, m_isUninitialized(true)

, m_isCallable(false)

, m_isClosed(false)

- , m_closedPromise(new ClosedPromise(scriptState->executionContext(), this, ClosedPromise::Closed))

+ , m_closedPromise(new ClosedPromise(scriptState->getExecutionContext(), this, ClosedPromise::Closed))

, m_actionTimer(this, &MediaKeySession::actionTimerFired)

{

WTF_LOG(Media, "MediaKeySession(%p)::MediaKeySession", this);

@@ -489,7 +489,7 @@ ScriptPromise MediaKeySession::load(ScriptState* scriptState, const String& sess

// FIXME: Implement this (http://crbug.com/448922).

// 6. Let origin be the origin of this object's Document.

- // (Available as executionContext()->securityOrigin() anytime.)

+ // (Available as getExecutionContext()->getSecurityOrigin() anytime.)

// 7. Let promise be a new promise.

LoadSessionResultPromise* result = new LoadSessionResultPromise(scriptState, this);

@@ -885,9 +885,9 @@ const AtomicString& MediaKeySession::interfaceName() const

return EventTargetNames::MediaKeySession;

}

-ExecutionContext* MediaKeySession::executionContext() const

+ExecutionContext* MediaKeySession::getExecutionContext() const

{

- return ActiveDOMObject::executionContext();

+ return ActiveDOMObject::getExecutionContext();

}

bool MediaKeySession::hasPendingActivity() const