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

Unified Diff: third_party/WebKit/Source/modules/mediasource/MediaSource.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
Index: third_party/WebKit/Source/modules/mediasource/MediaSource.cpp
diff --git a/third_party/WebKit/Source/modules/mediasource/MediaSource.cpp b/third_party/WebKit/Source/modules/mediasource/MediaSource.cpp
index 082971c476d8261c1cd1d96269f88b193f10cf5a..e111b52d003bda5f147d3e17d66af549d0f4fa21 100644
--- a/third_party/WebKit/Source/modules/mediasource/MediaSource.cpp
+++ b/third_party/WebKit/Source/modules/mediasource/MediaSource.cpp
@@ -119,24 +119,24 @@ MediaSource::MediaSource(ExecutionContext* context)
, m_liveSeekableRange(TimeRanges::create())
, m_addedToRegistryCounter(0)
{
- BLINK_MSLOG << __FUNCTION__ << " this=" << this;
+ BLINK_MSLOG << __func__ << " this=" << this;
}
MediaSource::~MediaSource()
{
- BLINK_MSLOG << __FUNCTION__ << " this=" << this;
+ BLINK_MSLOG << __func__ << " this=" << this;
DCHECK(isClosed());
}
void MediaSource::logAndThrowDOMException(ExceptionState& exceptionState, const ExceptionCode& error, const String& message)
{
- BLINK_MSLOG << __FUNCTION__ << " (error=" << error << ", message=" << message << ")";
+ BLINK_MSLOG << __func__ << " (error=" << error << ", message=" << message << ")";
exceptionState.throwDOMException(error, message);
}
SourceBuffer* MediaSource::addSourceBuffer(const String& type, ExceptionState& exceptionState)
{
- BLINK_MSLOG << __FUNCTION__ << " this=" << this << " type=" << type;
+ BLINK_MSLOG << __func__ << " this=" << this << " type=" << type;
// 2.2 https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#widl-MediaSource-addSourceBuffer-SourceBuffer-DOMString-type
// 1. If type is an empty string then throw an InvalidAccessError exception
@@ -177,13 +177,13 @@ SourceBuffer* MediaSource::addSourceBuffer(const String& type, ExceptionState& e
m_sourceBuffers->add(buffer);
// 7. Return the new object to the caller.
- BLINK_MSLOG << __FUNCTION__ << " this=" << this << " type=" << type << " -> " << buffer;
+ BLINK_MSLOG << __func__ << " this=" << this << " type=" << type << " -> " << buffer;
return buffer;
}
void MediaSource::removeSourceBuffer(SourceBuffer* buffer, ExceptionState& exceptionState)
{
- BLINK_MSLOG << __FUNCTION__ << " this=" << this << " buffer=" << buffer;
+ BLINK_MSLOG << __func__ << " this=" << this << " buffer=" << buffer;
// 2.2 https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#widl-MediaSource-removeSourceBuffer-void-SourceBuffer-sourceBuffer
@@ -251,7 +251,7 @@ bool MediaSource::isTypeSupported(const String& type)
// https://dvcs.w3.org/hg/html-media/raw-file/tip/media-source/media-source.html#widl-MediaSource-isTypeSupported-boolean-DOMString-type
// 1. If type is an empty string, then return false.
if (type.isEmpty()) {
- BLINK_MSLOG << __FUNCTION__ << "(" << type << ") -> false (empty input)";
+ BLINK_MSLOG << __func__ << "(" << type << ") -> false (empty input)";
return false;
}
@@ -260,14 +260,14 @@ bool MediaSource::isTypeSupported(const String& type)
// 2. If type does not contain a valid MIME type string, then return false.
if (contentType.type().isEmpty()) {
- BLINK_MSLOG << __FUNCTION__ << "(" << type << ") -> false (invalid mime type)";
+ BLINK_MSLOG << __func__ << "(" << type << ") -> false (invalid mime type)";
return false;
}
// Note: MediaSource.isTypeSupported() returning true implies that HTMLMediaElement.canPlayType() will return "maybe" or "probably"
// since it does not make sense for a MediaSource to support a type the HTMLMediaElement knows it cannot play.
if (HTMLMediaElement::supportsType(contentType) == WebMimeRegistry::IsNotSupported) {
- BLINK_MSLOG << __FUNCTION__ << "(" << type << ") -> false (not supported by HTMLMediaElement)";
+ BLINK_MSLOG << __func__ << "(" << type << ") -> false (not supported by HTMLMediaElement)";
return false;
}
@@ -276,7 +276,7 @@ bool MediaSource::isTypeSupported(const String& type)
// 5. If the MediaSource does not support the specified combination of media type, media subtype, and codecs then return false.
// 6. Return true.
bool result = MIMETypeRegistry::isSupportedMediaSourceMIMEType(contentType.type(), codecs);
- BLINK_MSLOG << __FUNCTION__ << "(" << type << ") -> " << (result ? "true" : "false");
+ BLINK_MSLOG << __func__ << "(" << type << ") -> " << (result ? "true" : "false");
return result;
}
@@ -500,7 +500,7 @@ void MediaSource::setReadyState(const AtomicString& state)
DCHECK(state == openKeyword() || state == closedKeyword() || state == endedKeyword());
AtomicString oldState = readyState();
- BLINK_MSLOG << __FUNCTION__ << " this=" << this << " : " << oldState << " -> " << state;
+ BLINK_MSLOG << __func__ << " this=" << this << " : " << oldState << " -> " << state;
if (state == closedKeyword()) {
m_webMediaSource.reset();

Powered by Google App Engine
This is Rietveld 408576698