media: Replace wtf/Assertions.h macros in favor of base/logging.h macros

third_party/WebKit/Source/modules/mediasource/MediaSource.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 33 matching lines @@
 #include "platform/MIMETypeRegistry.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/TraceEvent.h"
 #include "public/platform/WebMediaSource.h"
 #include "public/platform/WebSourceBuffer.h"
 #include "wtf/text/CString.h"
 
 using blink::WebMediaSource;
 using blink::WebSourceBuffer;
 
+#define MEDIA_SOURCE_LOG_LEVEL 3

[Srirama, 2016/05/19 15:00:22]

Is 3 fine to make it less verbose? or should we make it 1?

[wolenetz, 2016/05/19 17:53:33]

3 is fine. It's what I use personally when debugging the engine backing this
specific module :)

+
 namespace blink {
 
 static bool throwExceptionIfClosedOrUpdating(bool isOpen, bool isUpdating, ExceptionState& exceptionState)
 {
     if (!isOpen) {
         MediaSource::logAndThrowDOMException(exceptionState, InvalidStateError, "The MediaSource's readyState is not 'open'.");
         return true;
     }
     if (isUpdating) {
         MediaSource::logAndThrowDOMException(exceptionState, InvalidStateError, "The 'updating' attribute is true on one or more of this MediaSource's SourceBuffers.");
@@ skipping 31 matching lines @@
 MediaSource::MediaSource(ExecutionContext* context)
     : ActiveScriptWrappable(this)
     , ActiveDOMObject(context)
     , m_readyState(closedKeyword())
     , m_asyncEventQueue(GenericEventQueue::create(this))
     , m_attachedElement(nullptr)
     , m_sourceBuffers(SourceBufferList::create(getExecutionContext(), m_asyncEventQueue.get()))
     , m_activeSourceBuffers(SourceBufferList::create(getExecutionContext(), m_asyncEventQueue.get()))
     , m_isAddedToRegistry(false)
 {
-    WTF_LOG(Media, "MediaSource::MediaSource %p", this);
+    DVLOG(MEDIA_SOURCE_LOG_LEVEL) << "MediaSource " << this;

[wolenetz, 2016/05/19 17:53:33]

Just double-checking: does "this" not need the (void*) cast like was used in
HTMLMediaElement (is there no conflicting operator<< in MediaSource
inheritance?)

[Srirama, 2016/05/20 08:31:48]

It doesn't need, I verified and it is printing the pointer.

 }
 
 MediaSource::~MediaSource()
 {
-    WTF_LOG(Media, "MediaSource::~MediaSource %p", this);
+    DVLOG(MEDIA_SOURCE_LOG_LEVEL) << "~MediaSource " << this;
     ASSERT(isClosed());
 }
 
 void MediaSource::logAndThrowDOMException(ExceptionState& exceptionState, const ExceptionCode& error, const String& message)
 {
-    WTF_LOG(Media, "throwDOMException: error=%d msg=%s", error, message.utf8().data());
+    DVLOG(MEDIA_SOURCE_LOG_LEVEL) << "throwDOMException: error=" << error << " msg=" << message;

[wolenetz, 2016/05/19 17:53:33]

Is __FUNCTION__ usable here as a replacement (here and below), and can we please
include "this" here, too? For example:
DVLOG(...) << __FUNCTION__ << "(error=" << error << ", message=" << message <<
")" << this;

[Srirama, 2016/05/20 08:31:48]

Not able to print "this" here as it is a static function

[wolenetz, 2016/05/20 19:58:15]

Acknowledged.

     exceptionState.throwDOMException(error, message);
 }
 
 SourceBuffer* MediaSource::addSourceBuffer(const String& type, ExceptionState& exceptionState)
 {
-    WTF_LOG(Media, "MediaSource::addSourceBuffer(%s) %p", type.ascii().data(), this);
+    DVLOG(MEDIA_SOURCE_LOG_LEVEL) << "addSourceBuffer(" << type << ") " << this;
 
     // 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
     // and abort these steps.
     if (type.isEmpty()) {
         logAndThrowDOMException(exceptionState, InvalidAccessError, "The type provided is empty.");
         return 0;
     }
 
     // 2. If type contains a MIME type that is not supported ..., then throw a
@@ skipping 20 matching lines @@
         // 2. If type contains a MIME type that is not supported ..., then throw a NotSupportedError exception and abort these steps.
         // 3. If the user agent can't handle any more SourceBuffer objects then throw a QuotaExceededError exception and abort these steps
         return 0;
     }
 
     SourceBuffer* buffer = SourceBuffer::create(webSourceBuffer.release(), this, m_asyncEventQueue.get());
     // 6. Add the new object to sourceBuffers and fire a addsourcebuffer on that object.
     m_sourceBuffers->add(buffer);
 
     // 7. Return the new object to the caller.
-    WTF_LOG(Media, "MediaSource::addSourceBuffer(%s) %p -> %p", type.ascii().data(), this, buffer);
+    DVLOG(MEDIA_SOURCE_LOG_LEVEL) << "addSourceBuffer(" << type << ") " << this << " -> " << buffer;

[wolenetz, 2016/05/19 17:53:33]

Ditto on the double-check for |buffer| here please.

[Srirama, 2016/05/20 08:31:48]

I think you want the buffer pointer to be printed and if so, it is printing the
pointer.

[wolenetz, 2016/05/20 19:58:15]

Acknowledged.

     return buffer;
 }
 
 void MediaSource::removeSourceBuffer(SourceBuffer* buffer, ExceptionState& exceptionState)
 {
-    WTF_LOG(Media, "MediaSource::removeSourceBuffer() %p", this);
+    DVLOG(MEDIA_SOURCE_LOG_LEVEL) << "removeSourceBuffer() " << this;

[wolenetz, 2016/05/19 17:53:33]

nit: now seems like a good time to add |buffer| to this log message.

[Srirama, 2016/05/20 08:31:48]

Done.

 
     // 2.2 https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#widl-MediaSource-removeSourceBuffer-void-SourceBuffer-sourceBuffer
 
     // 1. If sourceBuffer specifies an object that is not in sourceBuffers then
     // throw a NotFoundError exception and abort these steps.
     if (!m_sourceBuffers->length() || !m_sourceBuffers->contains(buffer)) {
         logAndThrowDOMException(exceptionState, NotFoundError, "The SourceBuffer provided is not contained in this MediaSource.");
         return;
     }
 
@@ skipping 48 matching lines @@
 
     return false;
 }
 
 bool MediaSource::isTypeSupported(const String& type)
 {
     // Section 2.2 isTypeSupported() method steps.
     // 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()) {
-        WTF_LOG(Media, "MediaSource::isTypeSupported(%s) -> false (empty input)", type.ascii().data());
+        DVLOG(MEDIA_SOURCE_LOG_LEVEL) << "isTypeSupported(" << type << ") -> false (empty input)";
         return false;
     }
 
     ContentType contentType(type);
     String codecs = contentType.parameter("codecs");
 
     // 2. If type does not contain a valid MIME type string, then return false.
     if (contentType.type().isEmpty()) {
-        WTF_LOG(Media, "MediaSource::isTypeSupported(%s) -> false (invalid mime type)", type.ascii().data());
+        DVLOG(MEDIA_SOURCE_LOG_LEVEL) << "isTypeSupported(" << 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) {
-        WTF_LOG(Media, "MediaSource::isTypeSupported(%s) -> false (not supported by HTMLMediaElement)", type.ascii().data());
+        DVLOG(MEDIA_SOURCE_LOG_LEVEL) << "isTypeSupported(" << type << ") -> false (not supported by HTMLMediaElement)";
         return false;
     }
 
     // 3. If type contains a media type or media subtype that the MediaSource does not support, then return false.
     // 4. If type contains at a codec that the MediaSource does not support, then return false.
     // 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);
-    WTF_LOG(Media, "MediaSource::isTypeSupported(%s) -> %s", type.ascii().data(), result ? "true" : "false");
+    DVLOG(MEDIA_SOURCE_LOG_LEVEL) << "isTypeSupported(" << type << ") -> " << (result ? "true" : "false");
     return result;
 }
 
 const AtomicString& MediaSource::interfaceName() const
 {
     return EventTargetNames::MediaSource;
 }
 
 ExecutionContext* MediaSource::getExecutionContext() const
 {
@@ skipping 165 matching lines @@
 
     // 6. Update the media controller duration to new duration and run the HTMLMediaElement duration change algorithm.
     m_attachedElement->durationChanged(newDuration, requestSeek);
 }
 
 void MediaSource::setReadyState(const AtomicString& state)
 {
     ASSERT(state == openKeyword() || state == closedKeyword() || state == endedKeyword());
 
     AtomicString oldState = readyState();
-    WTF_LOG(Media, "MediaSource::setReadyState() %p : %s -> %s", this, oldState.ascii().data(), state.ascii().data());
+    DVLOG(MEDIA_SOURCE_LOG_LEVEL) << "setReadyState() " << this << " : " << oldState << " -> " << state;
 
     if (state == closedKeyword()) {
         m_webMediaSource.clear();
         m_attachedElement.clear();
     }
 
     if (oldState == state)
         return;
 
     m_readyState = state;
 
     onReadyStateChange(oldState, state);
 }
 
 void MediaSource::endOfStream(const AtomicString& error, ExceptionState& exceptionState)
 {
     DEFINE_STATIC_LOCAL(const AtomicString, network, ("network"));
     DEFINE_STATIC_LOCAL(const AtomicString, decode, ("decode"));
 
     if (error == network) {
         endOfStreamInternal(WebMediaSource::EndOfStreamStatusNetworkError, exceptionState);
     } else if (error == decode) {
         endOfStreamInternal(WebMediaSource::EndOfStreamStatusDecodeError, exceptionState);
     } else {
         ASSERT_NOT_REACHED(); // IDL enforcement should prevent this case.

[wolenetz, 2016/05/19 17:53:33]

NOTREACHED() ?

[Srirama, 2016/05/20 08:31:49]

Done.

     }
 }
 
 void MediaSource::endOfStream(ExceptionState& exceptionState)
 {
     endOfStreamInternal(WebMediaSource::EndOfStreamStatusNoError, exceptionState);
 }
 
 void MediaSource::endOfStreamInternal(const WebMediaSource::EndOfStreamStatus eosStatus, ExceptionState& exceptionState)
 {
@@ skipping 109 matching lines @@
         return nullptr;
     case WebMediaSource::AddStatusReachedIdLimit:
         ASSERT(!webSourceBuffer);
         // 2.2 https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#widl-MediaSource-addSourceBuffer-SourceBuffer-DOMString-type
         // Step 3: If the user agent can't handle any more SourceBuffer objects then throw
         // a QuotaExceededError exception and abort these steps.
         logAndThrowDOMException(exceptionState, QuotaExceededError, "This MediaSource has reached the limit of SourceBuffer objects it can handle. No additional SourceBuffer objects may be added.");
         return nullptr;
     }
 
     ASSERT_NOT_REACHED();

[wolenetz, 2016/05/19 17:53:33]

nit: NOTREACHED() ?

[Srirama, 2016/05/20 08:31:48]

Done.

     return nullptr;
 }
 
 void MediaSource::scheduleEvent(const AtomicString& eventName)
 {
     ASSERT(m_asyncEventQueue);
 
     Event* event = Event::create(eventName);
     event->setTarget(this);
 
     m_asyncEventQueue->enqueueEvent(event);
 }
 
 URLRegistry& MediaSource::registry() const
 {
     return MediaSourceRegistry::registry();
 }
 
 } // namespace blink