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

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

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

index a18e02555b22240d2a1a1aea7ed751fd2408ddb5..fbeffbbd610019dfd1d6c4bb317d754e1ea229bb 100644

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

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

@@ -91,7 +91,7 @@ public:

// EncryptedMediaRequest implementation.

WebString keySystem() const override { return m_keySystem; }

const WebVector<WebMediaKeySystemConfiguration>& supportedConfigurations() const override { return m_supportedConfigurations; }

- SecurityOrigin* securityOrigin() const override { return m_resolver->executionContext()->securityOrigin(); }

+ SecurityOrigin* getSecurityOrigin() const override { return m_resolver->getExecutionContext()->getSecurityOrigin(); }

void requestSucceeded(WebContentDecryptionModuleAccess*) override;

void requestNotSupported(const WebString& errorMessage) override;

@@ -196,7 +196,7 @@ void MediaKeySystemAccessInitializer::checkVideoCapabilityRobustness() const

}

if (hasEmptyRobustness) {

- m_resolver->executionContext()->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel,

+ m_resolver->getExecutionContext()->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel,

"It is recommended that a robustness level be specified. Not specifying the robustness level could "

"result in unexpected behavior in the future, potentially including failure to play."));

}

@@ -230,7 +230,7 @@ ScriptPromise NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess(

}

// 3-4. 'May Document use powerful features?' check.

- ExecutionContext* executionContext = scriptState->executionContext();

+ ExecutionContext* executionContext = scriptState->getExecutionContext();

String errorMessage;

if (executionContext->isSecureContext(errorMessage)) {

UseCounter::count(executionContext, UseCounter::EncryptedMediaSecureOrigin);