third_party/WebKit/Source/core/html/HTMLMediaElement.cpp - Issue 1988753002: media: Replace wtf/Assertions.h macros in favor of base/logging.h macros

Unified Diff: third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

Issue 1988753002: media: Replace wtf/Assertions.h macros in favor of base/logging.h macros (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address comments Created 4 years, 7 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/core/html/HTMLMediaElement.cpp

diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

index a23c6a4f7feeac806f2ce01e6a46fe57afe6bc7a..51df03bf3ff8aef7067de8f6c0527bcc47a34b66 100644

--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

@@ -94,6 +94,8 @@

#include "wtf/text/CString.h"

#include <limits>

+#define LOG_LEVEL 3

fs 2016/05/18 13:24:36 LOG_LEVEL is a pretty generic name, so clashes doe

Srirama 2016/05/18 13:55:01 Done.

#ifndef LOG_MEDIA_EVENTS

// Default to not logging events because so many are generated they can overwhelm the rest of

// the logging.

@@ -433,7 +435,7 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& docum

{

ThreadState::current()->registerPreFinalizer(this);

- WTF_LOG(Media, "HTMLMediaElement::HTMLMediaElement(%p)", this);

+ DVLOG(LOG_LEVEL) << "HTMLMediaElement(" << this << ")";

if (document.settings() && document.settings()->mediaPlaybackRequiresUserGesture())

m_userGestureRequiredForPlay = true;

@@ -446,7 +448,7 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& docum

HTMLMediaElement::~HTMLMediaElement()

{

- WTF_LOG(Media, "HTMLMediaElement::~HTMLMediaElement(%p)", this);

+ DVLOG(LOG_LEVEL) << "~HTMLMediaElement(" << this << ")";

// m_audioSourceNode is explicitly cleared by AudioNode::dispose().

// Since AudioNode::dispose() is guaranteed to be always called before

@@ -471,7 +473,7 @@ void HTMLMediaElement::dispose()

void HTMLMediaElement::didMoveToNewDocument(Document& oldDocument)

{

- WTF_LOG(Media, "HTMLMediaElement::didMoveToNewDocument(%p)", this);

+ DVLOG(LOG_LEVEL) << "didMoveToNewDocument";

if (m_shouldDelayLoadEvent) {

document().incrementLoadEventDelayCount();

@@ -558,7 +560,7 @@ LayoutObject* HTMLMediaElement::createLayoutObject(const ComputedStyle&)

Node::InsertionNotificationRequest HTMLMediaElement::insertedInto(ContainerNode* insertionPoint)

{

- WTF_LOG(Media, "HTMLMediaElement::insertedInto(%p, %p)", this, insertionPoint);

+ DVLOG(LOG_LEVEL) << "insertedInto(" << insertionPoint << ")";

HTMLElement::insertedInto(insertionPoint);

if (insertionPoint->inShadowIncludingDocument()) {

@@ -579,7 +581,7 @@ void HTMLMediaElement::didNotifySubtreeInsertionsToDocument()

void HTMLMediaElement::removedFrom(ContainerNode* insertionPoint)

{

- WTF_LOG(Media, "HTMLMediaElement::removedFrom(%p, %p)", this, insertionPoint);

+ DVLOG(LOG_LEVEL) << "removedFrom(" << insertionPoint << ")";

HTMLElement::removedFrom(insertionPoint);

if (insertionPoint->inActiveDocument()) {

@@ -605,7 +607,7 @@ void HTMLMediaElement::didRecalcStyle(StyleRecalcChange)

void HTMLMediaElement::scheduleTextTrackResourceLoad()

{

- WTF_LOG(Media, "HTMLMediaElement::scheduleTextTrackResourceLoad(%p)", this);

+ DVLOG(LOG_LEVEL) << "scheduleTextTrackResourceLoad";

m_pendingActionFlags |= LoadTextTrackResource;

@@ -628,7 +630,7 @@ void HTMLMediaElement::scheduleEvent(const AtomicString& eventName)

void HTMLMediaElement::scheduleEvent(Event* event)

{

#if LOG_MEDIA_EVENTS

- WTF_LOG(Media, "HTMLMediaElement::scheduleEvent(%p) - scheduling '%s'", this, event->type().ascii().data());

+ DVLOG(LOG_LEVEL) << "scheduleEvent - scheduling '" << event->type().ascii().data() << "'";

#endif

m_asyncEventQueue->enqueueEvent(event);

}

@@ -687,14 +689,14 @@ String HTMLMediaElement::canPlayType(const String& mimeType) const

break;

}

- WTF_LOG(Media, "HTMLMediaElement::canPlayType(%p, %s) -> %s", this, mimeType.utf8().data(), canPlay.utf8().data());

+ DVLOG(LOG_LEVEL) << "canPlayType(" << this << ", " << mimeType.utf8().data() << ") -> " << canPlay.utf8().data();

return canPlay;

}

void HTMLMediaElement::load()

{

- WTF_LOG(Media, "HTMLMediaElement::load(%p)", this);

+ DVLOG(LOG_LEVEL) << "load";

m_autoplayHelper->loadMethodCalled();

@@ -708,7 +710,7 @@ void HTMLMediaElement::load()

// in resource selection algorithm.

void HTMLMediaElement::invokeLoadAlgorithm()

{

- WTF_LOG(Media, "HTMLMediaElement::invokeLoadAlgorithm(%p)", this);

+ DVLOG(LOG_LEVEL) << "invokeLoadAlgorithm";

// Perform the cleanup required for the resource load algorithm to run.

stopPeriodicTimers();

@@ -796,7 +798,7 @@ void HTMLMediaElement::invokeLoadAlgorithm()

void HTMLMediaElement::invokeResourceSelectionAlgorithm()

{

- WTF_LOG(Media, "HTMLMediaElement::invokeResourceSelectionAlgorithm(%p)", this);

+ DVLOG(LOG_LEVEL) << "invokeResourceSelectionAlgorithm";

// The resource selection algorithm

// 1 - Set the networkState to NETWORK_NO_SOURCE

setNetworkState(NETWORK_NO_SOURCE);

@@ -840,7 +842,7 @@ void HTMLMediaElement::loadInternal()

void HTMLMediaElement::selectMediaResource()

{

- WTF_LOG(Media, "HTMLMediaElement::selectMediaResource(%p)", this);

+ DVLOG(LOG_LEVEL) << "selectMediaResource";

enum Mode { Object, Attribute, Children, Nothing };

Mode mode = Nothing;

@@ -871,7 +873,7 @@ void HTMLMediaElement::selectMediaResource()

setNetworkState(NETWORK_EMPTY);

updateDisplayState();

- WTF_LOG(Media, "HTMLMediaElement::selectMediaResource(%p), nothing to load", this);

+ DVLOG(LOG_LEVEL) << "selectMediaResource, nothing to load";

return;

}

@@ -885,15 +887,15 @@ void HTMLMediaElement::selectMediaResource()

switch (mode) {

case Object:

loadSourceFromObject();

- WTF_LOG(Media, "HTMLMediaElement::selectMediaResource(%p), using 'srcObject' attribute", this);

+ DVLOG(LOG_LEVEL) << "selectMediaResource, using 'srcObject' attribute";

break;

case Attribute:

loadSourceFromAttribute();

- WTF_LOG(Media, "HTMLMediaElement::selectMediaResource(%p), using 'src' attribute url", this);

+ DVLOG(LOG_LEVEL) << "selectMediaResource, using 'src' attribute url";

break;

case Children:

loadNextSourceChild();

- WTF_LOG(Media, "HTMLMediaElement::selectMediaResource(%p), using source element", this);

+ DVLOG(LOG_LEVEL) << "selectMediaResource, using source element";

break;

default:

ASSERT_NOT_REACHED();

@@ -919,7 +921,7 @@ void HTMLMediaElement::loadSourceFromAttribute()

// If the src attribute's value is the empty string ... jump down to the failed step below

if (srcValue.isEmpty()) {

mediaLoadingFailed(WebMediaPlayer::NetworkStateFormatError);

- WTF_LOG(Media, "HTMLMediaElement::selectMediaResource(%p), empty 'src'", this);

+ DVLOG(LOG_LEVEL) << "selectMediaResource, empty 'src'";

return;

}

@@ -958,7 +960,7 @@ void HTMLMediaElement::loadResource(const WebMediaPlayerSource& source, ContentT

if (source.isURL()) {

url = source.getAsURL();

ASSERT(isSafeToLoadURL(url, Complain));

- WTF_LOG(Media, "HTMLMediaElement::loadResource(%p, %s, %s)", this, urlForLoggingMedia(url).utf8().data(), contentType.raw().utf8().data());

+ DVLOG(LOG_LEVEL) << "loadResource(" << urlForLoggingMedia(url).utf8().data() << ", " << contentType.raw().utf8().data() << ")";

}

LocalFrame* frame = document().frame();

@@ -979,7 +981,7 @@ void HTMLMediaElement::loadResource(const WebMediaPlayerSource& source, ContentT

if (m_audioSourceNode)

m_audioSourceNode->onCurrentSrcChanged(m_currentSrc);

- WTF_LOG(Media, "HTMLMediaElement::loadResource(%p) - m_currentSrc -> %s", this, urlForLoggingMedia(m_currentSrc).utf8().data());

+ DVLOG(LOG_LEVEL) << "loadResource - m_currentSrc -> " << urlForLoggingMedia(m_currentSrc).utf8().data();

startProgressEventTimer();

@@ -1023,7 +1025,7 @@ void HTMLMediaElement::loadResource(const WebMediaPlayerSource& source, ContentT

// Skip this optional deferral for MediaStream sources or any blob URL,

// including MediaSource blob URLs.

if (!isStreamOrBlobUrl && effectivePreloadType() == WebMediaPlayer::PreloadNone) {

- WTF_LOG(Media, "HTMLMediaElement::loadResource(%p) : Delaying load because preload == 'none'", this);

+ DVLOG(LOG_LEVEL) << "loadResource : Delaying load because preload == 'none'";

deferLoad();

} else {

startPlayerLoad();

@@ -1244,7 +1246,7 @@ void HTMLMediaElement::disableAutomaticTextTrackSelection()

bool HTMLMediaElement::isSafeToLoadURL(const KURL& url, InvalidURLAction actionIfInvalid)

{

if (!url.isValid()) {

- WTF_LOG(Media, "HTMLMediaElement::isSafeToLoadURL(%p, %s) -> FALSE because url is invalid", this, urlForLoggingMedia(url).utf8().data());

+ DVLOG(LOG_LEVEL) << "isSafeToLoadURL(" << urlForLoggingMedia(url).utf8().data() << ") -> FALSE because url is invalid";

return false;

}

@@ -1252,12 +1254,12 @@ bool HTMLMediaElement::isSafeToLoadURL(const KURL& url, InvalidURLAction actionI

if (!frame || !document().getSecurityOrigin()->canDisplay(url)) {

if (actionIfInvalid == Complain)

FrameLoader::reportLocalLoadFailed(frame, url.elidedString());

- WTF_LOG(Media, "HTMLMediaElement::isSafeToLoadURL(%p, %s) -> FALSE rejected by SecurityOrigin", this, urlForLoggingMedia(url).utf8().data());

+ DVLOG(LOG_LEVEL) << "isSafeToLoadURL(" << urlForLoggingMedia(url).utf8().data() << ") -> FALSE rejected by SecurityOrigin";

return false;

}

if (!document().contentSecurityPolicy()->allowMediaFromSource(url)) {

- WTF_LOG(Media, "HTMLMediaElement::isSafeToLoadURL(%p, %s) -> rejected by Content Security Policy", this, urlForLoggingMedia(url).utf8().data());

+ DVLOG(LOG_LEVEL) << "isSafeToLoadURL(" << urlForLoggingMedia(url).utf8().data() << ") -> rejected by Content Security Policy";

return false;

}

@@ -1288,7 +1290,7 @@ void HTMLMediaElement::startProgressEventTimer()

void HTMLMediaElement::waitForSourceChange()

{

- WTF_LOG(Media, "HTMLMediaElement::waitForSourceChange(%p)", this);

+ DVLOG(LOG_LEVEL) << "waitForSourceChange";

stopPeriodicTimers();

m_loadState = WaitingForSource;

@@ -1307,7 +1309,7 @@ void HTMLMediaElement::waitForSourceChange()

void HTMLMediaElement::noneSupported()

{

- WTF_LOG(Media, "HTMLMediaElement::noneSupported(%p)", this);

+ DVLOG(LOG_LEVEL) << "noneSupported";

stopPeriodicTimers();

m_loadState = WaitingForSource;

@@ -1347,7 +1349,7 @@ void HTMLMediaElement::noneSupported()

void HTMLMediaElement::mediaEngineError(MediaError* err)

{

ASSERT(m_readyState >= HAVE_METADATA);

- WTF_LOG(Media, "HTMLMediaElement::mediaEngineError(%p, %d)", this, static_cast<int>(err->code()));

+ DVLOG(LOG_LEVEL) << "mediaEngineError(" << static_cast<int>(err->code()) << ")";

// 1 - The user agent should cancel the fetching process.

stopPeriodicTimers();

@@ -1372,7 +1374,7 @@ void HTMLMediaElement::mediaEngineError(MediaError* err)

void HTMLMediaElement::cancelPendingEventsAndCallbacks()

{

- WTF_LOG(Media, "HTMLMediaElement::cancelPendingEventsAndCallbacks(%p)", this);

+ DVLOG(LOG_LEVEL) << "cancelPendingEventsAndCallbacks";

m_asyncEventQueue->cancelAllEvents();

for (HTMLSourceElement* source = Traversal<HTMLSourceElement>::firstChild(*this); source; source = Traversal<HTMLSourceElement>::nextSibling(*source))

@@ -1400,7 +1402,7 @@ void HTMLMediaElement::mediaLoadingFailed(WebMediaPlayer::NetworkState error)

if (m_currentSourceNode)

m_currentSourceNode->scheduleErrorEvent();

else

- WTF_LOG(Media, "HTMLMediaElement::setNetworkState(%p) - error event not sent, <source> was removed", this);

+ DVLOG(LOG_LEVEL) << "setNetworkState - error event not sent, <source> was removed";

// 9.Otherwise.10 - Asynchronously await a stable state. The synchronous section consists of all the remaining steps of this algorithm until the algorithm says the synchronous section has ended.

@@ -1408,10 +1410,10 @@ void HTMLMediaElement::mediaLoadingFailed(WebMediaPlayer::NetworkState error)

forgetResourceSpecificTracks();

if (havePotentialSourceChild()) {

- WTF_LOG(Media, "HTMLMediaElement::setNetworkState(%p) - scheduling next <source>", this);

+ DVLOG(LOG_LEVEL) << "setNetworkState - scheduling next <source>";

scheduleNextSourceChild();

} else {

- WTF_LOG(Media, "HTMLMediaElement::setNetworkState(%p) - no more <source> elements, waiting", this);

+ DVLOG(LOG_LEVEL) << "setNetworkState - no more <source> elements, waiting";

waitForSourceChange();

}

@@ -1434,7 +1436,7 @@ void HTMLMediaElement::mediaLoadingFailed(WebMediaPlayer::NetworkState error)

void HTMLMediaElement::setNetworkState(WebMediaPlayer::NetworkState state)

{

- WTF_LOG(Media, "HTMLMediaElement::setNetworkState(%p, %d) - current state is %d", this, static_cast<int>(state), static_cast<int>(m_networkState));

+ DVLOG(LOG_LEVEL) << "setNetworkState(" << static_cast<int>(state) << ") - current state is " << static_cast<int>(m_networkState);

if (state == WebMediaPlayer::NetworkStateEmpty) {

// Just update the cached state and leave, we can't do anything.

@@ -1489,7 +1491,7 @@ void HTMLMediaElement::readyStateChanged()

void HTMLMediaElement::setReadyState(ReadyState state)

{

- WTF_LOG(Media, "HTMLMediaElement::setReadyState(%p, %d) - current state is %d,", this, static_cast<int>(state), static_cast<int>(m_readyState));

+ DVLOG(LOG_LEVEL) << "setReadyState(" << static_cast<int>(state) << ") - current state is " << static_cast<int>(m_readyState);

// Set "wasPotentiallyPlaying" BEFORE updating m_readyState, potentiallyPlaying() uses it

bool wasPotentiallyPlaying = potentiallyPlaying();

@@ -1655,7 +1657,7 @@ void HTMLMediaElement::progressEventTimerFired(Timer<HTMLMediaElement>*)

void HTMLMediaElement::addPlayedRange(double start, double end)

{

- WTF_LOG(Media, "HTMLMediaElement::addPlayedRange(%p, %f, %f)", this, start, end);

+ DVLOG(LOG_LEVEL) << "addPlayedRange(" << start << ", " << end << ")";

if (!m_playedTimeRanges)

m_playedTimeRanges = TimeRanges::create();

m_playedTimeRanges->add(start, end);

@@ -1668,14 +1670,14 @@ bool HTMLMediaElement::supportsSave() const

void HTMLMediaElement::setIgnorePreloadNone()

{

- WTF_LOG(Media, "HTMLMediaElement::setIgnorePreloadNone(%p)", this);

+ DVLOG(LOG_LEVEL) << "setIgnorePreloadNone";

m_ignorePreloadNone = true;

setPlayerPreload();

}

void HTMLMediaElement::seek(double time)

{

- WTF_LOG(Media, "HTMLMediaElement::seek(%p, %f)", this, time);

+ DVLOG(LOG_LEVEL) << "seek(" << time << ")";

// 2 - If the media element's readyState is HAVE_NOTHING, abort these steps.

if (m_readyState == HAVE_NOTHING)

@@ -1712,7 +1714,7 @@ void HTMLMediaElement::seek(double time)

// fire a 'seeked' event.

double mediaTime = webMediaPlayer()->mediaTimeForTimeValue(time);

if (time != mediaTime) {

- WTF_LOG(Media, "HTMLMediaElement::seek(%p, %f) - media timeline equivalent is %f", this, time, mediaTime);

+ DVLOG(LOG_LEVEL) << "seek(" << time << ") - media timeline equivalent is " << mediaTime;

time = mediaTime;

}

@@ -1746,7 +1748,7 @@ void HTMLMediaElement::seek(double time)

void HTMLMediaElement::finishSeek()

{

- WTF_LOG(Media, "HTMLMediaElement::finishSeek(%p)", this);

+ DVLOG(LOG_LEVEL) << "finishSeek";

// 14 - Set the seeking IDL attribute to false.

m_seeking = false;

@@ -1792,7 +1794,7 @@ void HTMLMediaElement::refreshCachedTime() const

void HTMLMediaElement::invalidateCachedTime()

{

- WTF_LOG(Media, "HTMLMediaElement::invalidateCachedTime(%p)", this);

+ DVLOG(LOG_LEVEL) << "invalidateCachedTime";

m_cachedTime = std::numeric_limits<double>::quiet_NaN();

}

@@ -1806,7 +1808,7 @@ double HTMLMediaElement::currentTime() const

return 0;

if (m_seeking) {

- WTF_LOG(Media, "HTMLMediaElement::currentTime(%p) - seeking, returning %f", this, m_lastSeekTime);

+ DVLOG(LOG_LEVEL) << "currentTime - seeking, returning " << m_lastSeekTime;

return m_lastSeekTime;

}

@@ -1815,7 +1817,7 @@ double HTMLMediaElement::currentTime() const

static const double minCachedDeltaForWarning = 0.01;

double delta = m_cachedTime - webMediaPlayer()->currentTime();

if (delta > minCachedDeltaForWarning)

- WTF_LOG(Media, "HTMLMediaElement::currentTime(%p) - WARNING, cached time is %f seconds off of media time when paused", this, delta);

+ DVLOG(LOG_LEVEL) << "currentTime - WARNING, cached time is " << delta << "seconds off of media time when paused";

#endif

return m_cachedTime;

}

@@ -1887,7 +1889,7 @@ double HTMLMediaElement::playbackRate() const

void HTMLMediaElement::setPlaybackRate(double rate)

{

- WTF_LOG(Media, "HTMLMediaElement::setPlaybackRate(%p, %f)", this, rate);

+ DVLOG(LOG_LEVEL) << "setPlaybackRate(" << rate << ")";

if (m_playbackRate != rate) {

m_playbackRate = rate;

@@ -1947,7 +1949,7 @@ String HTMLMediaElement::preload() const

void HTMLMediaElement::setPreload(const AtomicString& preload)

{

- WTF_LOG(Media, "HTMLMediaElement::setPreload(%p, %s)", this, preload.utf8().data());

+ DVLOG(LOG_LEVEL) << "setPreload(" << preload.utf8().data() << ")";

setAttribute(preloadAttr, preload);

}

@@ -2030,7 +2032,7 @@ ScriptPromise HTMLMediaElement::playForBindings(ScriptState* scriptState)

Nullable<ExceptionCode> HTMLMediaElement::play()

{

- WTF_LOG(Media, "HTMLMediaElement::play(%p)", this);

+ DVLOG(LOG_LEVEL) << "play";

m_autoplayHelper->playMethodCalled();

@@ -2059,7 +2061,7 @@ Nullable<ExceptionCode> HTMLMediaElement::play()

void HTMLMediaElement::playInternal()

{

- WTF_LOG(Media, "HTMLMediaElement::playInternal(%p)", this);

+ DVLOG(LOG_LEVEL) << "playInternal";

// Always return the buffering strategy to normal when not paused,

// regardless of the cause. (In contrast with aggressive buffering which is

@@ -2098,7 +2100,7 @@ void HTMLMediaElement::playInternal()

void HTMLMediaElement::pause()

{

- WTF_LOG(Media, "HTMLMediaElement::pause(%p)", this);

+ DVLOG(LOG_LEVEL) << "pause";

// Only buffer aggressively on a user-initiated pause. Other types of pauses

// (which go directly to pauseInternal()) should not cause this behavior.

@@ -2110,7 +2112,7 @@ void HTMLMediaElement::pause()

void HTMLMediaElement::pauseInternal()

{

- WTF_LOG(Media, "HTMLMediaElement::pauseInternal(%p)", this);

+ DVLOG(LOG_LEVEL) << "pauseInternal";

if (m_networkState == NETWORK_EMPTY)

invokeResourceSelectionAlgorithm();

@@ -2159,7 +2161,7 @@ bool HTMLMediaElement::loop() const

void HTMLMediaElement::setLoop(bool b)

{

- WTF_LOG(Media, "HTMLMediaElement::setLoop(%p, %s)", this, boolString(b));

+ DVLOG(LOG_LEVEL) << "setLoop(" << boolString(b) << ")";

setBooleanAttribute(loopAttr, b);

}

@@ -2198,7 +2200,7 @@ double HTMLMediaElement::volume() const

void HTMLMediaElement::setVolume(double vol, ExceptionState& exceptionState)

{

- WTF_LOG(Media, "HTMLMediaElement::setVolume(%p, %f)", this, vol);

+ DVLOG(LOG_LEVEL) << "setVolume(" << vol << ")";

if (m_volume == vol)

return;

@@ -2222,7 +2224,7 @@ bool HTMLMediaElement::muted() const

void HTMLMediaElement::setMuted(bool muted)

{

- WTF_LOG(Media, "HTMLMediaElement::setMuted(%p, %s)", this, boolString(muted));

+ DVLOG(LOG_LEVEL) << "setMuted(" << boolString(muted) << ")";

if (m_muted == muted)

return;

@@ -2328,7 +2330,7 @@ AudioTrackList& HTMLMediaElement::audioTracks()

void HTMLMediaElement::audioTrackChanged(WebMediaPlayer::TrackId trackId, bool enabled)

{

- WTF_LOG(Media, "HTMLMediaElement::audioTrackChanged(%p) trackId=%u enabled=%d", this, trackId, enabled);

+ DVLOG(LOG_LEVEL) << "audioTrackChanged trackId= " << trackId << " enabled=" << enabled;

fs 2016/05/18 13:24:36 boolString(enabled)?

Srirama 2016/05/18 13:55:01 Done.

ASSERT(RuntimeEnabledFeatures::audioVideoTracksEnabled());

audioTracks().scheduleChangeEvent();

@@ -2354,8 +2356,8 @@ void HTMLMediaElement::audioTracksTimerFired(Timer<HTMLMediaElement>*)

WebMediaPlayer::TrackId HTMLMediaElement::addAudioTrack(const WebString& id, WebMediaPlayerClient::AudioTrackKind kind, const WebString& label, const WebString& language, bool enabled)

{

AtomicString kindString = AudioKindToString(kind);

- WTF_LOG(Media, "HTMLMediaElement::addAudioTrack(%p, '%s', '%s', '%s', '%s', %d)",

- this, id.utf8().data(), kindString.ascii().data(), label.utf8().data(), language.utf8().data(), enabled);

+ DVLOG(LOG_LEVEL) << "addAudioTrack('" << id.utf8().data() << "', ' " << kindString.ascii().data()

+ << "', '" << label.utf8().data() << "', '" << language.utf8().data() << "', " << enabled << ")";

fs 2016/05/18 13:24:36 Ditto.

Srirama 2016/05/18 13:55:00 Done.

if (!RuntimeEnabledFeatures::audioVideoTracksEnabled())

return 0;

@@ -2368,7 +2370,7 @@ WebMediaPlayer::TrackId HTMLMediaElement::addAudioTrack(const WebString& id, Web

void HTMLMediaElement::removeAudioTrack(WebMediaPlayer::TrackId trackId)

{

- WTF_LOG(Media, "HTMLMediaElement::removeAudioTrack(%p)", this);

+ DVLOG(LOG_LEVEL) << "removeAudioTrack";

if (!RuntimeEnabledFeatures::audioVideoTracksEnabled())

return;

@@ -2384,7 +2386,7 @@ VideoTrackList& HTMLMediaElement::videoTracks()

void HTMLMediaElement::selectedVideoTrackChanged(WebMediaPlayer::TrackId* selectedTrackId)

{

- WTF_LOG(Media, "HTMLMediaElement::selectedVideoTrackChanged(%p) selectedTrackId=%s", this, selectedTrackId ? String::format("%u", *selectedTrackId).ascii().data() : "none");

+ DVLOG(LOG_LEVEL) << "selectedVideoTrackChanged selectedTrackId=" << (selectedTrackId ? String::format("%u", *selectedTrackId).ascii().data() : "none");

ASSERT(RuntimeEnabledFeatures::audioVideoTracksEnabled());

if (selectedTrackId)

@@ -2398,8 +2400,8 @@ void HTMLMediaElement::selectedVideoTrackChanged(WebMediaPlayer::TrackId* select

WebMediaPlayer::TrackId HTMLMediaElement::addVideoTrack(const WebString& id, WebMediaPlayerClient::VideoTrackKind kind, const WebString& label, const WebString& language, bool selected)

{

AtomicString kindString = VideoKindToString(kind);

- WTF_LOG(Media, "HTMLMediaElement::addVideoTrack(%p, '%s', '%s', '%s', '%s', %d)",

- this, id.utf8().data(), kindString.ascii().data(), label.utf8().data(), language.utf8().data(), selected);

+ DVLOG(LOG_LEVEL) << "addVideoTrack('" << id.utf8().data() << "', '" << kindString.ascii().data()

+ << "', '" << label.utf8().data() << "', '" << language.utf8().data() << "', " << selected << ")";

fs 2016/05/18 13:24:36 boolString(selected)

Srirama 2016/05/18 13:55:01 Done.

if (!RuntimeEnabledFeatures::audioVideoTracksEnabled())

return 0;

@@ -2416,7 +2418,7 @@ WebMediaPlayer::TrackId HTMLMediaElement::addVideoTrack(const WebString& id, Web

void HTMLMediaElement::removeVideoTrack(WebMediaPlayer::TrackId trackId)

{

- WTF_LOG(Media, "HTMLMediaElement::removeVideoTrack(%p)", this);

+ DVLOG(LOG_LEVEL) << "removeVideoTrack";

if (!RuntimeEnabledFeatures::audioVideoTracksEnabled())

return;

@@ -2574,7 +2576,7 @@ void HTMLMediaElement::didRemoveTrackElement(HTMLTrackElement* trackElement)

{

#if !LOG_DISABLED

KURL url = trackElement->getNonEmptyURLAttribute(srcAttr);

- WTF_LOG(Media, "HTMLMediaElement::didRemoveTrackElement(%p) - 'src' is %s", this, urlForLoggingMedia(url).utf8().data());

+ DVLOG(LOG_LEVEL) << "didRemoveTrackElement - 'src' is " << urlForLoggingMedia(url).utf8().data();

#endif

TextTrack* textTrack = trackElement->track();

@@ -2642,13 +2644,13 @@ KURL HTMLMediaElement::selectNextSourceChild(ContentType* contentType, InvalidUR

// Don't log if this was just called to find out if there are any valid <source> elements.

bool shouldLog = actionIfInvalid != DoNothing;

if (shouldLog)

- WTF_LOG(Media, "HTMLMediaElement::selectNextSourceChild(%p)", this);

+ DVLOG(LOG_LEVEL) << "selectNextSourceChild";

#endif

if (!m_nextChildNodeToConsider) {

#if !LOG_DISABLED

if (shouldLog)

- WTF_LOG(Media, "HTMLMediaElement::selectNextSourceChild(%p) -> 0x0000, \"\"", this);

+ DVLOG(LOG_LEVEL) << "selectNextSourceChild -> 0x0000, \"\"";

#endif

return KURL();

}

@@ -2682,7 +2684,7 @@ KURL HTMLMediaElement::selectNextSourceChild(ContentType* contentType, InvalidUR

const AtomicString& srcValue = source->fastGetAttribute(srcAttr);

#if !LOG_DISABLED

if (shouldLog)

- WTF_LOG(Media, "HTMLMediaElement::selectNextSourceChild(%p) - 'src' is %s", this, urlForLoggingMedia(mediaURL).utf8().data());

+ DVLOG(LOG_LEVEL) << "selectNextSourceChild - 'src' is " << urlForLoggingMedia(mediaURL).utf8().data();

#endif

if (srcValue.isEmpty())

goto checkAgain;

@@ -2707,7 +2709,7 @@ KURL HTMLMediaElement::selectNextSourceChild(ContentType* contentType, InvalidUR

if (!type.isEmpty()) {

#if !LOG_DISABLED

if (shouldLog)

- WTF_LOG(Media, "HTMLMediaElement::selectNextSourceChild(%p) - 'type' is '%s'", this, type.utf8().data());

+ DVLOG(LOG_LEVEL) << "selectNextSourceChild - 'type' is '" << type.utf8().data() << "'";

#endif

if (!supportsType(ContentType(type)))

goto checkAgain;

@@ -2733,18 +2735,18 @@ checkAgain:

#if !LOG_DISABLED

if (shouldLog)

- WTF_LOG(Media, "HTMLMediaElement::selectNextSourceChild(%p) -> %p, %s", this, m_currentSourceNode.get(), canUseSourceElement ? urlForLoggingMedia(mediaURL).utf8().data() : "");

+ DVLOG(LOG_LEVEL) << "selectNextSourceChild -> " << m_currentSourceNode.get() << ", " << (canUseSourceElement ? urlForLoggingMedia(mediaURL).utf8().data() : "");

#endif

return canUseSourceElement ? mediaURL : KURL();

}

void HTMLMediaElement::sourceWasAdded(HTMLSourceElement* source)

{

- WTF_LOG(Media, "HTMLMediaElement::sourceWasAdded(%p, %p)", this, source);

+ DVLOG(LOG_LEVEL) << "sourceWasAdded(" << source << ")";

#if !LOG_DISABLED

KURL url = source->getNonEmptyURLAttribute(srcAttr);

- WTF_LOG(Media, "HTMLMediaElement::sourceWasAdded(%p) - 'src' is %s", this, urlForLoggingMedia(url).utf8().data());

+ DVLOG(LOG_LEVEL) << "sourceWasAdded - 'src' is " << urlForLoggingMedia(url).utf8().data();

#endif

// We should only consider a <source> element when there is not src attribute at all.

@@ -2762,7 +2764,7 @@ void HTMLMediaElement::sourceWasAdded(HTMLSourceElement* source)

}

if (m_currentSourceNode && source == m_currentSourceNode->nextSibling()) {

- WTF_LOG(Media, "HTMLMediaElement::sourceWasAdded(%p) - <source> inserted immediately after current source", this);

+ DVLOG(LOG_LEVEL) << "sourceWasAdded - <source> inserted immediately after current source";

// Ignore current |m_nextChildNodeToConsider| and consider |source|.

m_nextChildNodeToConsider = source;

return;

@@ -2792,11 +2794,11 @@ void HTMLMediaElement::sourceWasAdded(HTMLSourceElement* source)

void HTMLMediaElement::sourceWasRemoved(HTMLSourceElement* source)

{

- WTF_LOG(Media, "HTMLMediaElement::sourceWasRemoved(%p, %p)", this, source);

+ DVLOG(LOG_LEVEL) << "sourceWasRemoved(" << source << ")";

#if !LOG_DISABLED

KURL url = source->getNonEmptyURLAttribute(srcAttr);

- WTF_LOG(Media, "HTMLMediaElement::sourceWasRemoved(%p) - 'src' is %s", this, urlForLoggingMedia(url).utf8().data());

+ DVLOG(LOG_LEVEL) << "sourceWasRemoved - 'src' is " << urlForLoggingMedia(url).utf8().data();

#endif

if (source != m_currentSourceNode && source != m_nextChildNodeToConsider)

@@ -2805,19 +2807,19 @@ void HTMLMediaElement::sourceWasRemoved(HTMLSourceElement* source)

if (source == m_nextChildNodeToConsider) {

if (m_currentSourceNode)

m_nextChildNodeToConsider = m_currentSourceNode->nextSibling();

- WTF_LOG(Media, "HTMLMediaElement::sourceRemoved(%p) - m_nextChildNodeToConsider set to %p", this, m_nextChildNodeToConsider.get());

+ DVLOG(LOG_LEVEL) << "sourceWasRemoved - m_nextChildNodeToConsider set to " << m_nextChildNodeToConsider.get();

} else if (source == m_currentSourceNode) {

// Clear the current source node pointer, but don't change the movie as the spec says:

// 4.8.8 - Dynamically modifying a source element and its attribute when the element is already

// inserted in a video or audio element will have no effect.

m_currentSourceNode = nullptr;

- WTF_LOG(Media, "HTMLMediaElement::sourceRemoved(%p) - m_currentSourceNode set to 0", this);

+ DVLOG(LOG_LEVEL) << "sourceWasRemoved - m_currentSourceNode set to 0";

}

void HTMLMediaElement::timeChanged()

{

- WTF_LOG(Media, "HTMLMediaElement::timeChanged(%p)", this);

+ DVLOG(LOG_LEVEL) << "timeChanged(" << this << ")";

cueTimeline().updateActiveCues(currentTime());

@@ -2867,7 +2869,7 @@ void HTMLMediaElement::timeChanged()

void HTMLMediaElement::durationChanged()

{

- WTF_LOG(Media, "HTMLMediaElement::durationChanged(%p)", this);

+ DVLOG(LOG_LEVEL) << "durationChanged";

// FIXME: Change WebMediaPlayer to convey the currentTime

// when the duration change occured. The current WebMediaPlayer

// implementations always clamp currentTime() to duration()

@@ -2877,13 +2879,13 @@ void HTMLMediaElement::durationChanged()

void HTMLMediaElement::durationChanged(double duration, bool requestSeek)

{

- WTF_LOG(Media, "HTMLMediaElement::durationChanged(%p, %f, %d)", this, duration, requestSeek);

+ DVLOG(LOG_LEVEL) << "durationChanged(" << duration << ", " << requestSeek << ")";

fs 2016/05/18 13:24:36 boolString?

Srirama 2016/05/18 13:55:01 Done.

// Abort if duration unchanged.

if (m_duration == duration)

return;

- WTF_LOG(Media, "HTMLMediaElement::durationChanged(%p) : %f -> %f", this, m_duration, duration);

+ DVLOG(LOG_LEVEL) << "durationChanged : " << m_duration << " -> " << duration;

m_duration = duration;

scheduleEvent(EventTypeNames::durationchange);

@@ -2898,7 +2900,7 @@ void HTMLMediaElement::durationChanged(double duration, bool requestSeek)

void HTMLMediaElement::playbackStateChanged()

{

- WTF_LOG(Media, "HTMLMediaElement::playbackStateChanged(%p)", this);

+ DVLOG(LOG_LEVEL) << "playbackStateChanged";

if (!webMediaPlayer())

return;

@@ -2961,7 +2963,7 @@ void HTMLMediaElement::repaint()

void HTMLMediaElement::sizeChanged()

{

- WTF_LOG(Media, "HTMLMediaElement::sizeChanged(%p)", this);

+ DVLOG(LOG_LEVEL) << "sizeChanged";

ASSERT(hasVideo()); // "resize" makes no sense absent video.

if (m_readyState > HAVE_NOTHING && isHTMLVideoElement())

@@ -3062,8 +3064,8 @@ void HTMLMediaElement::updatePlayState()

bool isPlaying = webMediaPlayer() && !webMediaPlayer()->paused();

bool shouldBePlaying = potentiallyPlaying();

- WTF_LOG(Media, "HTMLMediaElement::updatePlayState(%p) - shouldBePlaying = %s, isPlaying = %s",

- this, boolString(shouldBePlaying), boolString(isPlaying));

+ DVLOG(LOG_LEVEL) << "updatePlayState - shouldBePlaying = "

+ << boolString(shouldBePlaying) << ", isPlaying = " << boolString(isPlaying);

if (shouldBePlaying) {

setDisplayMode(Video);

@@ -3154,7 +3156,7 @@ void HTMLMediaElement::clearMediaPlayer()

void HTMLMediaElement::stop()

{

- WTF_LOG(Media, "HTMLMediaElement::stop(%p)", this);

+ DVLOG(LOG_LEVEL) << "stop";

// Close the async event queue so that no events are enqueued.

cancelPendingEventsAndCallbacks();

@@ -3221,14 +3223,14 @@ bool HTMLMediaElement::isFullscreen() const

void HTMLMediaElement::enterFullscreen()

{

- WTF_LOG(Media, "HTMLMediaElement::enterFullscreen(%p)", this);

+ DVLOG(LOG_LEVEL) << "enterFullscreen";

Fullscreen::from(document()).requestFullscreen(*this, Fullscreen::PrefixedRequest);

}

void HTMLMediaElement::exitFullscreen()

{

- WTF_LOG(Media, "HTMLMediaElement::exitFullscreen(%p)", this);

+ DVLOG(LOG_LEVEL) << "exitFullscreen";

Fullscreen::from(document()).exitFullscreen();

}

@@ -3324,14 +3326,14 @@ TextTrackContainer& HTMLMediaElement::ensureTextTrackContainer()

void HTMLMediaElement::updateTextTrackDisplay()

{

- WTF_LOG(Media, "HTMLMediaElement::updateTextTrackDisplay(%p)", this);

+ DVLOG(LOG_LEVEL) << "updateTextTrackDisplay";

ensureTextTrackContainer().updateDisplay(*this, TextTrackContainer::DidNotStartExposingControls);

}

void HTMLMediaElement::mediaControlsDidBecomeVisible()

{

- WTF_LOG(Media, "HTMLMediaElement::mediaControlsDidBecomeVisible(%p)", this);

+ DVLOG(LOG_LEVEL) << "mediaControlsDidBecomeVisible";

// When the user agent starts exposing a user interface for a video element,

// the user agent should run the rules for updating the text track rendering

@@ -3412,7 +3414,7 @@ void HTMLMediaElement::setShouldDelayLoadEvent(bool shouldDelay)

if (m_shouldDelayLoadEvent == shouldDelay)

return;

- WTF_LOG(Media, "HTMLMediaElement::setShouldDelayLoadEvent(%p, %s)", this, boolString(shouldDelay));

+ DVLOG(LOG_LEVEL) << "setShouldDelayLoadEvent(" << boolString(shouldDelay) << ")";

m_shouldDelayLoadEvent = shouldDelay;

if (shouldDelay)

@@ -3483,7 +3485,7 @@ CueTimeline& HTMLMediaElement::cueTimeline()

void HTMLMediaElement::configureTextTrackDisplay()

{

ASSERT(m_textTracks);

- WTF_LOG(Media, "HTMLMediaElement::configureTextTrackDisplay(%p)", this);

+ DVLOG(LOG_LEVEL) << "configureTextTrackDisplay";

if (m_processingPreferenceChange)

return;

« no previous file with comments | « no previous file | no next file » | no next file with comments »