Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(493)

Unified Diff: third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

Issue 2161193003: Use __func__ instead of __FUNCTION__. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resync Created 4 years, 5 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 | « styleguide/c++/c++11.html ('k') | third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
diff --git a/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp b/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
index 00d82db6edae7171bca575f1277a3bbb3c16792f..5e3722638ef794e3fc5aeef12dbfc08539cfe177 100644
--- a/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
+++ b/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
@@ -118,7 +118,7 @@ SetMediaKeysHandler::SetMediaKeysHandler(ScriptState* scriptState, HTMLMediaElem
, m_madeReservation(false)
, m_timer(this, &SetMediaKeysHandler::timerFired)
{
- DVLOG(EME_LOG_LEVEL) << __FUNCTION__;
+ DVLOG(EME_LOG_LEVEL) << __func__;
// 5. Run the following steps in parallel.
m_timer.startOneShot(0, BLINK_FROM_HERE);
@@ -135,7 +135,7 @@ void SetMediaKeysHandler::timerFired(Timer<SetMediaKeysHandler>*)
void SetMediaKeysHandler::clearExistingMediaKeys()
{
- DVLOG(EME_LOG_LEVEL) << __FUNCTION__;
+ DVLOG(EME_LOG_LEVEL) << __func__;
HTMLMediaElementEncryptedMedia& thisElement = HTMLMediaElementEncryptedMedia::from(*m_element);
// 5.1 If mediaKeys is not null, the CDM instance represented by
@@ -184,7 +184,7 @@ void SetMediaKeysHandler::clearExistingMediaKeys()
void SetMediaKeysHandler::setNewMediaKeys()
{
- DVLOG(EME_LOG_LEVEL) << __FUNCTION__;
+ DVLOG(EME_LOG_LEVEL) << __func__;
// 5.3 If mediaKeys is not null, run the following steps:
if (m_newMediaKeys) {
@@ -212,7 +212,7 @@ void SetMediaKeysHandler::setNewMediaKeys()
void SetMediaKeysHandler::finish()
{
- DVLOG(EME_LOG_LEVEL) << __FUNCTION__;
+ DVLOG(EME_LOG_LEVEL) << __func__;
HTMLMediaElementEncryptedMedia& thisElement = HTMLMediaElementEncryptedMedia::from(*m_element);
// 5.4 Set the mediaKeys attribute to mediaKeys.
@@ -244,7 +244,7 @@ void SetMediaKeysHandler::fail(ExceptionCode code, const String& errorMessage)
void SetMediaKeysHandler::clearFailed(ExceptionCode code, const String& errorMessage)
{
- DVLOG(EME_LOG_LEVEL) << __FUNCTION__ << "(" << code << ", " << errorMessage << ")";
+ DVLOG(EME_LOG_LEVEL) << __func__ << "(" << code << ", " << errorMessage << ")";
HTMLMediaElementEncryptedMedia& thisElement = HTMLMediaElementEncryptedMedia::from(*m_element);
// 5.2.4 If the preceding step failed, let this object's attaching media
@@ -256,7 +256,7 @@ void SetMediaKeysHandler::clearFailed(ExceptionCode code, const String& errorMes
void SetMediaKeysHandler::setFailed(ExceptionCode code, const String& errorMessage)
{
- DVLOG(EME_LOG_LEVEL) << __FUNCTION__ << "(" << code << ", " << errorMessage << ")";
+ DVLOG(EME_LOG_LEVEL) << __func__ << "(" << code << ", " << errorMessage << ")";
HTMLMediaElementEncryptedMedia& thisElement = HTMLMediaElementEncryptedMedia::from(*m_element);
// 5.3.2 If the preceding step failed (in setContentDecryptionModule()
@@ -288,7 +288,7 @@ HTMLMediaElementEncryptedMedia::HTMLMediaElementEncryptedMedia(HTMLMediaElement&
HTMLMediaElementEncryptedMedia::~HTMLMediaElementEncryptedMedia()
{
- DVLOG(EME_LOG_LEVEL) << __FUNCTION__;
+ DVLOG(EME_LOG_LEVEL) << __func__;
}
const char* HTMLMediaElementEncryptedMedia::supplementName()
@@ -315,7 +315,7 @@ MediaKeys* HTMLMediaElementEncryptedMedia::mediaKeys(HTMLMediaElement& element)
ScriptPromise HTMLMediaElementEncryptedMedia::setMediaKeys(ScriptState* scriptState, HTMLMediaElement& element, MediaKeys* mediaKeys)
{
HTMLMediaElementEncryptedMedia& thisElement = HTMLMediaElementEncryptedMedia::from(element);
- DVLOG(EME_LOG_LEVEL) << __FUNCTION__ << " current(" << thisElement.m_mediaKeys.get() << "), new(" << mediaKeys << ")";
+ DVLOG(EME_LOG_LEVEL) << __func__ << " current(" << thisElement.m_mediaKeys.get() << "), new(" << mediaKeys << ")";
// From http://w3c.github.io/encrypted-media/#setMediaKeys
@@ -352,7 +352,7 @@ static Event* createEncryptedEvent(WebEncryptedMediaInitDataType initDataType, c
void HTMLMediaElementEncryptedMedia::encrypted(WebEncryptedMediaInitDataType initDataType, const unsigned char* initData, unsigned initDataLength)
{
- DVLOG(EME_LOG_LEVEL) << __FUNCTION__;
+ DVLOG(EME_LOG_LEVEL) << __func__;
Event* event;
if (m_mediaElement->isMediaDataCORSSameOrigin(m_mediaElement->getExecutionContext()->getSecurityOrigin())) {
@@ -369,7 +369,7 @@ void HTMLMediaElementEncryptedMedia::encrypted(WebEncryptedMediaInitDataType ini
void HTMLMediaElementEncryptedMedia::didBlockPlaybackWaitingForKey()
{
- DVLOG(EME_LOG_LEVEL) << __FUNCTION__;
+ DVLOG(EME_LOG_LEVEL) << __func__;
// From https://w3c.github.io/encrypted-media/#queue-waitingforkey:
// It should only be called when the HTMLMediaElement object is potentially
@@ -394,7 +394,7 @@ void HTMLMediaElementEncryptedMedia::didBlockPlaybackWaitingForKey()
void HTMLMediaElementEncryptedMedia::didResumePlaybackBlockedForKey()
{
- DVLOG(EME_LOG_LEVEL) << __FUNCTION__;
+ DVLOG(EME_LOG_LEVEL) << __func__;
// Logic is on the Chromium side to attempt to resume playback when a new
// key is available. However, |m_isWaitingForKey| needs to be cleared so
« no previous file with comments | « styleguide/c++/c++11.html ('k') | third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698