summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorDana Jansens <danakj@google.com>2016-03-09 12:57:22 -0800
committerDana Jansens <danakj@google.com>2016-03-09 21:00:02 +0000
commit71331253d6537b9409518dec2368388c5d73cb94 (patch)
treed3a6572ec863fe33893dd79353f17c763c4194b0 /media
parentaa5b4809788929faac190ac72bdcac0cbb2e7fc4 (diff)
downloadchromium_src-71331253d6537b9409518dec2368388c5d73cb94.zip
chromium_src-71331253d6537b9409518dec2368388c5d73cb94.tar.gz
chromium_src-71331253d6537b9409518dec2368388c5d73cb94.tar.bz2
blink: Rename modules/ method to prefix with get when they collide.
This focuses on modules/ to rename methods that are named foo() and that return a Foo*, which will have collisions when foo() is renamed to Foo() in chromium style. This patch uses the following to do many of the replacements, so it's a bit on the larger side.. git gs '\b$foo()'|grep '\.\(cpp\|h\|cc\):'|cut -d: -f1|sort|uniq|xargs sed -ie 's/\b$foo()/$getFoo()/g' R=haraken@chromium.org TBR=brettw, chrishtr BUG=582312 Review URL: https://codereview.chromium.org/1773813007 . Cr-Commit-Position: refs/heads/master@{#380209}
Diffstat (limited to 'media')
-rw-r--r--media/blink/webencryptedmediaclient_impl.cc10
-rw-r--r--media/blink/webmediaplayer_impl.cc4
-rw-r--r--media/blink/webmediaplayer_impl.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/media/blink/webencryptedmediaclient_impl.cc b/media/blink/webencryptedmediaclient_impl.cc
index abf9eff..8d2aa2e 100644
--- a/media/blink/webencryptedmediaclient_impl.cc
+++ b/media/blink/webencryptedmediaclient_impl.cc
@@ -102,12 +102,12 @@ void WebEncryptedMediaClientImpl::requestMediaKeySystemAccess(
if (GetMediaClient()) {
GURL security_origin(
- blink::WebStringToGURL(request.securityOrigin().toString()));
+ blink::WebStringToGURL(request.getSecurityOrigin().toString()));
GetMediaClient()->RecordRapporURL("Media.OriginUrl.EME", security_origin);
blink::WebString error_message;
- if (!request.securityOrigin().isPotentiallyTrustworthy(error_message)) {
+ if (!request.getSecurityOrigin().isPotentiallyTrustworthy(error_message)) {
GetMediaClient()->RecordRapporURL("Media.OriginUrl.EME.Insecure",
security_origin);
}
@@ -115,7 +115,7 @@ void WebEncryptedMediaClientImpl::requestMediaKeySystemAccess(
key_system_config_selector_.SelectConfig(
request.keySystem(), request.supportedConfigurations(),
- request.securityOrigin(), are_secure_codecs_supported_cb_.Run(),
+ request.getSecurityOrigin(), are_secure_codecs_supported_cb_.Run(),
base::Bind(&WebEncryptedMediaClientImpl::OnRequestSucceeded,
weak_factory_.GetWeakPtr(), request),
base::Bind(&WebEncryptedMediaClientImpl::OnRequestNotSupported,
@@ -139,8 +139,8 @@ void WebEncryptedMediaClientImpl::OnRequestSucceeded(
// TODO(sandersd): Pass |are_secure_codecs_required| along and use it to
// configure the CDM security level and use of secure surfaces on Android.
request.requestSucceeded(WebContentDecryptionModuleAccessImpl::Create(
- request.keySystem(), request.securityOrigin(), accumulated_configuration,
- cdm_config, weak_factory_.GetWeakPtr()));
+ request.keySystem(), request.getSecurityOrigin(),
+ accumulated_configuration, cdm_config, weak_factory_.GetWeakPtr()));
}
void WebEncryptedMediaClientImpl::OnRequestNotSupported(
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 96f787e..071e70e 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -282,7 +282,7 @@ void WebMediaPlayerImpl::DoLoad(LoadType load_type,
DCHECK(main_task_runner_->BelongsToCurrentThread());
GURL gurl(url);
- ReportMetrics(load_type, gurl, frame_->document().securityOrigin());
+ ReportMetrics(load_type, gurl, frame_->document().getSecurityOrigin());
// Set subresource URL for crash reporting.
base::debug::SetCrashKeyValue("subresource_url", gurl.spec());
@@ -1270,7 +1270,7 @@ void WebMediaPlayerImpl::SetReadyState(WebMediaPlayer::ReadyState state) {
client_->readyStateChanged();
}
-blink::WebAudioSourceProvider* WebMediaPlayerImpl::audioSourceProvider() {
+blink::WebAudioSourceProvider* WebMediaPlayerImpl::getAudioSourceProvider() {
return audio_source_provider_.get();
}
diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
index 9cba070..0dd640d 100644
--- a/media/blink/webmediaplayer_impl.h
+++ b/media/blink/webmediaplayer_impl.h
@@ -158,7 +158,7 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
bool premultiply_alpha,
bool flip_y) override;
- blink::WebAudioSourceProvider* audioSourceProvider() override;
+ blink::WebAudioSourceProvider* getAudioSourceProvider() override;
void setContentDecryptionModule(
blink::WebContentDecryptionModule* cdm,