Source/WebCore/html/HTMLMediaElement.cpp - Issue 13643002: Rename LOG() to LOG_INFO()

Unified Diff: Source/WebCore/html/HTMLMediaElement.cpp

Issue 13643002: Rename LOG() to LOG_INFO() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master

Patch Set: rebase Created 7 years, 8 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: Source/WebCore/html/HTMLMediaElement.cpp

diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp

index 6dde9946dab6f73cc9ecff5e6654a7543d707acf..57f89ab5a0331d616b3659084132ee6b2df2cd74 100644

--- a/Source/WebCore/html/HTMLMediaElement.cpp

+++ b/Source/WebCore/html/HTMLMediaElement.cpp

@@ -302,7 +302,7 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document* docum

, m_audioSourceNode(0)

#endif

{

- LOG(Media, "HTMLMediaElement::HTMLMediaElement");

+ LOG_INFO(Media, "HTMLMediaElement::HTMLMediaElement");

document->registerForMediaVolumeCallbacks(this);

document->registerForPrivateBrowsingStateChangedCallbacks(this);

@@ -321,7 +321,7 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document* docum

HTMLMediaElement::~HTMLMediaElement()

{

- LOG(Media, "HTMLMediaElement::~HTMLMediaElement");

+ LOG_INFO(Media, "HTMLMediaElement::~HTMLMediaElement");

if (m_isWaitingUntilMediaCanStart)

document()->removeMediaCanStartListener(this);

setShouldDelayLoadEvent(false);

@@ -551,7 +551,7 @@ bool HTMLMediaElement::childShouldCreateRenderer(const NodeRenderingContext& chi

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

{

- LOG(Media, "HTMLMediaElement::insertedInto");

+ LOG_INFO(Media, "HTMLMediaElement::insertedInto");

HTMLElement::insertedInto(insertionPoint);

if (insertionPoint->inDocument() && !getAttribute(srcAttr).isEmpty() && m_networkState == NETWORK_EMPTY)

scheduleDelayedAction(LoadMediaResource);

@@ -562,7 +562,7 @@ Node::InsertionNotificationRequest HTMLMediaElement::insertedInto(ContainerNode*

void HTMLMediaElement::removedFrom(ContainerNode* insertionPoint)

{

if (insertionPoint->inDocument()) {

- LOG(Media, "HTMLMediaElement::removedFromDocument");

+ LOG_INFO(Media, "HTMLMediaElement::removedFromDocument");

configureMediaControls();

if (m_networkState > NETWORK_EMPTY)

pause();

@@ -601,7 +601,7 @@ void HTMLMediaElement::didRecalcStyle(StyleChange)

void HTMLMediaElement::scheduleDelayedAction(DelayedActionType actionType)

{

- LOG(Media, "HTMLMediaElement::scheduleLoad");

+ LOG_INFO(Media, "HTMLMediaElement::scheduleLoad");

if ((actionType & LoadMediaResource) && !(m_pendingActionFlags & LoadMediaResource)) {

#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)

@@ -636,7 +636,7 @@ void HTMLMediaElement::scheduleNextSourceChild()

void HTMLMediaElement::scheduleEvent(const AtomicString& eventName)

{

#if LOG_MEDIA_EVENTS

- LOG(Media, "HTMLMediaElement::scheduleEvent - scheduling '%s'", eventName.string().ascii().data());

+ LOG_INFO(Media, "HTMLMediaElement::scheduleEvent - scheduling '%s'", eventName.string().ascii().data());

#endif

RefPtr<Event> event = Event::create(eventName, false, true);

event->setTarget(this);

@@ -702,7 +702,7 @@ String HTMLMediaElement::canPlayType(const String& mimeType, const String& keySy

break;

}

- LOG(Media, "HTMLMediaElement::canPlayType(%s, %s, %s) -> %s", mimeType.utf8().data(), keySystem.utf8().data(), url.elidedString().utf8().data(), canPlay.utf8().data());

+ LOG_INFO(Media, "HTMLMediaElement::canPlayType(%s, %s, %s) -> %s", mimeType.utf8().data(), keySystem.utf8().data(), url.elidedString().utf8().data(), canPlay.utf8().data());

return canPlay;

}

@@ -711,7 +711,7 @@ void HTMLMediaElement::load()

{

RefPtr<HTMLMediaElement> protect(this); // loadInternal may result in a 'beforeload' event, which can make arbitrary DOM mutations.

- LOG(Media, "HTMLMediaElement::load()");

+ LOG_INFO(Media, "HTMLMediaElement::load()");

if (userGestureRequiredForLoad() && !ScriptController::processingUserGesture())

return;

@@ -726,7 +726,7 @@ void HTMLMediaElement::load()

void HTMLMediaElement::prepareForLoad()

{

- LOG(Media, "HTMLMediaElement::prepareForLoad");

+ LOG_INFO(Media, "HTMLMediaElement::prepareForLoad");

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

stopPeriodicTimers();

@@ -852,7 +852,7 @@ void HTMLMediaElement::loadInternal()

void HTMLMediaElement::selectMediaResource()

{

- LOG(Media, "HTMLMediaElement::selectMediaResource");

+ LOG_INFO(Media, "HTMLMediaElement::selectMediaResource");

enum Mode { attribute, children };

@@ -880,7 +880,7 @@ void HTMLMediaElement::selectMediaResource()

setShouldDelayLoadEvent(false);

m_networkState = NETWORK_EMPTY;

- LOG(Media, "HTMLMediaElement::selectMediaResource, nothing to load");

+ LOG_INFO(Media, "HTMLMediaElement::selectMediaResource, nothing to load");

return;

}

@@ -901,7 +901,7 @@ void HTMLMediaElement::selectMediaResource()

KURL mediaURL = getNonEmptyURLAttribute(srcAttr);

if (mediaURL.isEmpty()) {

mediaLoadingFailed(MediaPlayer::FormatError);

- LOG(Media, "HTMLMediaElement::selectMediaResource, empty 'src'");

+ LOG_INFO(Media, "HTMLMediaElement::selectMediaResource, empty 'src'");

return;

}

@@ -915,7 +915,7 @@ void HTMLMediaElement::selectMediaResource()

// will have to pick a media engine based on the file extension.

ContentType contentType((String()));

loadResource(mediaURL, contentType, String());

- LOG(Media, "HTMLMediaElement::selectMediaResource, using 'src' attribute url");

+ LOG_INFO(Media, "HTMLMediaElement::selectMediaResource, using 'src' attribute url");

return;

}

@@ -967,7 +967,7 @@ void HTMLMediaElement::loadResource(const KURL& initialURL, ContentType& content

{

ASSERT(isSafeToLoadURL(initialURL, Complain));

- LOG(Media, "HTMLMediaElement::loadResource(%s, %s, %s)", urlForLoggingMedia(initialURL).utf8().data(), contentType.raw().utf8().data(), keySystem.utf8().data());

+ LOG_INFO(Media, "HTMLMediaElement::loadResource(%s, %s, %s)", urlForLoggingMedia(initialURL).utf8().data(), contentType.raw().utf8().data(), keySystem.utf8().data());

Frame* frame = document()->frame();

if (!frame) {

@@ -1006,11 +1006,11 @@ void HTMLMediaElement::loadResource(const KURL& initialURL, ContentType& content

#if !PLATFORM(CHROMIUM)

if (resource) {

url = createFileURLForApplicationCacheResource(resource->path());

- LOG(Media, "HTMLMediaElement::loadResource - will load from app cache -> %s", urlForLoggingMedia(url).utf8().data());

+ LOG_INFO(Media, "HTMLMediaElement::loadResource - will load from app cache -> %s", urlForLoggingMedia(url).utf8().data());

}

#endif

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

+ LOG_INFO(Media, "HTMLMediaElement::loadResource - m_currentSrc -> %s", urlForLoggingMedia(m_currentSrc).utf8().data());

#if ENABLE(MEDIA_STREAM)

if (MediaStreamRegistry::registry().lookupMediaStreamDescriptor(url.string()))

@@ -1087,7 +1087,7 @@ static bool eventTimeCueCompare(const std::pair<double, TextTrackCue*>& a,

void HTMLMediaElement::updateActiveTextTrackCues(float movieTime)

{

- LOG(Media, "HTMLMediaElement::updateActiveTextTracks");

+ LOG_INFO(Media, "HTMLMediaElement::updateActiveTextTracks");

// 4.8.10.8 Playing the media resource

@@ -1461,7 +1461,7 @@ void HTMLMediaElement::textTrackRemoveCue(TextTrack*, PassRefPtr<TextTrackCue> c

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

{

if (!url.isValid()) {

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

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

return false;

}

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

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

if (actionIfInvalid == Complain)

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

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

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

return false;

}

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

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

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

return false;

}

@@ -1493,7 +1493,7 @@ void HTMLMediaElement::startProgressEventTimer()

void HTMLMediaElement::waitForSourceChange()

{

- LOG(Media, "HTMLMediaElement::waitForSourceChange");

+ LOG_INFO(Media, "HTMLMediaElement::waitForSourceChange");

stopPeriodicTimers();

m_loadState = WaitingForSource;

@@ -1512,7 +1512,7 @@ void HTMLMediaElement::waitForSourceChange()

void HTMLMediaElement::noneSupported()

{

- LOG(Media, "HTMLMediaElement::noneSupported");

+ LOG_INFO(Media, "HTMLMediaElement::noneSupported");

stopPeriodicTimers();

m_loadState = WaitingForSource;

@@ -1552,7 +1552,7 @@ void HTMLMediaElement::noneSupported()

void HTMLMediaElement::mediaEngineError(PassRefPtr<MediaError> err)

{

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

+ LOG_INFO(Media, "HTMLMediaElement::mediaEngineError(%d)", static_cast<int>(err->code()));

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

stopPeriodicTimers();

@@ -1583,7 +1583,7 @@ void HTMLMediaElement::mediaEngineError(PassRefPtr<MediaError> err)

void HTMLMediaElement::cancelPendingEventsAndCallbacks()

{

- LOG(Media, "HTMLMediaElement::cancelPendingEventsAndCallbacks");

+ LOG_INFO(Media, "HTMLMediaElement::cancelPendingEventsAndCallbacks");

m_asyncEventQueue->cancelAllEvents();

for (Node* node = firstChild(); node; node = node->nextSibling()) {

@@ -1657,13 +1657,13 @@ void HTMLMediaElement::mediaLoadingFailed(MediaPlayer::NetworkState error)

if (m_currentSourceNode)

m_currentSourceNode->scheduleErrorEvent();

else

- LOG(Media, "HTMLMediaElement::setNetworkState - error event not sent, <source> was removed");

+ LOG_INFO(Media, "HTMLMediaElement::setNetworkState - error event not sent, <source> was removed");

if (havePotentialSourceChild()) {

- LOG(Media, "HTMLMediaElement::setNetworkState - scheduling next <source>");

+ LOG_INFO(Media, "HTMLMediaElement::setNetworkState - scheduling next <source>");

scheduleNextSourceChild();

} else {

- LOG(Media, "HTMLMediaElement::setNetworkState - no more <source> elements, waiting");

+ LOG_INFO(Media, "HTMLMediaElement::setNetworkState - no more <source> elements, waiting");

waitForSourceChange();

}

@@ -1688,7 +1688,7 @@ void HTMLMediaElement::mediaLoadingFailed(MediaPlayer::NetworkState error)

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

{

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

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

if (state == MediaPlayer::Empty) {

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

@@ -1750,7 +1750,7 @@ void HTMLMediaElement::mediaPlayerReadyStateChanged(MediaPlayer*)

void HTMLMediaElement::setReadyState(MediaPlayer::ReadyState state)

{

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

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

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

bool wasPotentiallyPlaying = potentiallyPlaying();

@@ -2017,19 +2017,19 @@ void HTMLMediaElement::progressEventTimerFired(Timer<HTMLMediaElement>*)

void HTMLMediaElement::rewind(float timeDelta)

{

- LOG(Media, "HTMLMediaElement::rewind(%f)", timeDelta);

+ LOG_INFO(Media, "HTMLMediaElement::rewind(%f)", timeDelta);

setCurrentTime(max(currentTime() - timeDelta, minTimeSeekable()), IGNORE_EXCEPTION);

}

void HTMLMediaElement::returnToRealtime()

{

- LOG(Media, "HTMLMediaElement::returnToRealtime");

+ LOG_INFO(Media, "HTMLMediaElement::returnToRealtime");

setCurrentTime(maxTimeSeekable(), IGNORE_EXCEPTION);

}

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

{

- LOG(Media, "HTMLMediaElement::addPlayedRange(%f, %f)", start, end);

+ LOG_INFO(Media, "HTMLMediaElement::addPlayedRange(%f, %f)", start, end);

if (!m_playedTimeRanges)

m_playedTimeRanges = TimeRanges::create();

m_playedTimeRanges->add(start, end);

@@ -2047,7 +2047,7 @@ bool HTMLMediaElement::supportsScanning() const

void HTMLMediaElement::prepareToPlay()

{

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

+ LOG_INFO(Media, "HTMLMediaElement::prepareToPlay(%p)", this);

if (m_havePreparedToPlay)

return;

m_havePreparedToPlay = true;

@@ -2056,7 +2056,7 @@ void HTMLMediaElement::prepareToPlay()

void HTMLMediaElement::seek(float time, ExceptionCode& ec)

{

- LOG(Media, "HTMLMediaElement::seek(%f)", time);

+ LOG_INFO(Media, "HTMLMediaElement::seek(%f)", time);

// 4.8.9.9 Seeking

@@ -2099,7 +2099,7 @@ void HTMLMediaElement::seek(float time, ExceptionCode& ec)

#if !LOG_DISABLED

float mediaTime = m_player->mediaTimeForTimeValue(time);

if (time != mediaTime)

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

+ LOG_INFO(Media, "HTMLMediaElement::seek(%f) - media timeline equivalent is %f", time, mediaTime);

#endif

time = m_player->mediaTimeForTimeValue(time);

@@ -2153,7 +2153,7 @@ void HTMLMediaElement::seek(float time, ExceptionCode& ec)

void HTMLMediaElement::finishSeek()

{

- LOG(Media, "HTMLMediaElement::finishSeek");

+ LOG_INFO(Media, "HTMLMediaElement::finishSeek");

// 4.8.10.9 Seeking step 14

m_seeking = false;

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

void HTMLMediaElement::invalidateCachedTime()

{

- LOG(Media, "HTMLMediaElement::invalidateCachedTime");

+ LOG_INFO(Media, "HTMLMediaElement::invalidateCachedTime");

// Don't try to cache movie time when playback first starts as the time reported by the engine

// sometimes fluctuates for a short amount of time, so the cached time will be off if we take it

@@ -2214,7 +2214,7 @@ float HTMLMediaElement::currentTime() const

return 0;

if (m_seeking) {

- LOG(Media, "HTMLMediaElement::currentTime - seeking, returning %f", m_lastSeekTime);

+ LOG_INFO(Media, "HTMLMediaElement::currentTime - seeking, returning %f", m_lastSeekTime);

return m_lastSeekTime;

}

@@ -2222,7 +2222,7 @@ float HTMLMediaElement::currentTime() const

#if LOG_CACHED_TIME_WARNINGS

float delta = m_cachedTime - m_player->currentTime();

if (delta > minCachedDeltaForWarning)

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

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

#endif

return m_cachedTime;

}

@@ -2241,7 +2241,7 @@ float HTMLMediaElement::currentTime() const

#if LOG_CACHED_TIME_WARNINGS

float delta = adjustedCacheTime - m_player->currentTime();

if (delta > minCachedDeltaForWarning)

- LOG(Media, "HTMLMediaElement::currentTime - WARNING, cached time is %f seconds off of media time when playing", delta);

+ LOG_INFO(Media, "HTMLMediaElement::currentTime - WARNING, cached time is %f seconds off of media time when playing", delta);

#endif

return adjustedCacheTime;

}

@@ -2251,7 +2251,7 @@ float HTMLMediaElement::currentTime() const

if (maximumDurationToCacheMediaTime && now > m_minimumWallClockTimeToCacheMediaTime && m_cachedTime != MediaPlayer::invalidTime()) {

double wallClockDelta = now - m_cachedTimeWallClockUpdateTime;

float delta = m_cachedTime + (m_playbackRate * wallClockDelta) - m_player->currentTime();

- LOG(Media, "HTMLMediaElement::currentTime - cached time was %f seconds off of media time when it expired", delta);

+ LOG_INFO(Media, "HTMLMediaElement::currentTime - cached time was %f seconds off of media time when it expired", delta);

}

#endif

@@ -2320,7 +2320,7 @@ float HTMLMediaElement::playbackRate() const

void HTMLMediaElement::setPlaybackRate(float rate)

{

- LOG(Media, "HTMLMediaElement::setPlaybackRate(%f)", rate);

+ LOG_INFO(Media, "HTMLMediaElement::setPlaybackRate(%f)", rate);

if (m_playbackRate != rate) {

m_playbackRate = rate;

@@ -2346,7 +2346,7 @@ bool HTMLMediaElement::webkitPreservesPitch() const

void HTMLMediaElement::setWebkitPreservesPitch(bool preservesPitch)

{

- LOG(Media, "HTMLMediaElement::setWebkitPreservesPitch(%s)", boolString(preservesPitch));

+ LOG_INFO(Media, "HTMLMediaElement::setWebkitPreservesPitch(%s)", boolString(preservesPitch));

m_webkitPreservesPitch = preservesPitch;

@@ -2371,7 +2371,7 @@ bool HTMLMediaElement::autoplay() const

void HTMLMediaElement::setAutoplay(bool b)

{

- LOG(Media, "HTMLMediaElement::setAutoplay(%s)", boolString(b));

+ LOG_INFO(Media, "HTMLMediaElement::setAutoplay(%s)", boolString(b));

setBooleanAttribute(autoplayAttr, b);

}

@@ -2395,13 +2395,13 @@ String HTMLMediaElement::preload() const

void HTMLMediaElement::setPreload(const String& preload)

{

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

+ LOG_INFO(Media, "HTMLMediaElement::setPreload(%s)", preload.utf8().data());

setAttribute(preloadAttr, preload);

}

void HTMLMediaElement::play()

{

- LOG(Media, "HTMLMediaElement::play()");

+ LOG_INFO(Media, "HTMLMediaElement::play()");

if (userGestureRequiredForRateChange() && !ScriptController::processingUserGesture())

return;

@@ -2423,7 +2423,7 @@ void HTMLMediaElement::play()

void HTMLMediaElement::playInternal()

{

- LOG(Media, "HTMLMediaElement::playInternal");

+ LOG_INFO(Media, "HTMLMediaElement::playInternal");

// 4.8.10.9. Playing the media resource

if (!m_player || m_networkState == NETWORK_EMPTY)

@@ -2453,7 +2453,7 @@ void HTMLMediaElement::playInternal()

void HTMLMediaElement::pause()

{

- LOG(Media, "HTMLMediaElement::pause()");

+ LOG_INFO(Media, "HTMLMediaElement::pause()");

if (userGestureRequiredForRateChange() && !ScriptController::processingUserGesture())

return;

@@ -2464,7 +2464,7 @@ void HTMLMediaElement::pause()

void HTMLMediaElement::pauseInternal()

{

- LOG(Media, "HTMLMediaElement::pauseInternal");

+ LOG_INFO(Media, "HTMLMediaElement::pauseInternal");

// 4.8.10.9. Playing the media resource

if (!m_player || m_networkState == NETWORK_EMPTY)

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

void HTMLMediaElement::setLoop(bool b)

{

- LOG(Media, "HTMLMediaElement::setLoop(%s)", boolString(b));

+ LOG_INFO(Media, "HTMLMediaElement::setLoop(%s)", boolString(b));

setBooleanAttribute(loopAttr, b);

}

@@ -2626,7 +2626,7 @@ bool HTMLMediaElement::controls() const

void HTMLMediaElement::setControls(bool b)

{

- LOG(Media, "HTMLMediaElement::setControls(%s)", boolString(b));

+ LOG_INFO(Media, "HTMLMediaElement::setControls(%s)", boolString(b));

setBooleanAttribute(controlsAttr, b);

}

@@ -2637,7 +2637,7 @@ float HTMLMediaElement::volume() const

void HTMLMediaElement::setVolume(float vol, ExceptionCode& ec)

{

- LOG(Media, "HTMLMediaElement::setVolume(%f)", vol);

+ LOG_INFO(Media, "HTMLMediaElement::setVolume(%f)", vol);

if (vol < 0.0f || vol > 1.0f) {

ec = INDEX_SIZE_ERR;

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

void HTMLMediaElement::setMuted(bool muted)

{

- LOG(Media, "HTMLMediaElement::setMuted(%s)", boolString(muted));

+ LOG_INFO(Media, "HTMLMediaElement::setMuted(%s)", boolString(muted));

if (m_muted != muted) {

m_muted = muted;

@@ -2676,7 +2676,7 @@ void HTMLMediaElement::setMuted(bool muted)

void HTMLMediaElement::togglePlayState()

{

- LOG(Media, "HTMLMediaElement::togglePlayState - canPlay() is %s", boolString(canPlay()));

+ LOG_INFO(Media, "HTMLMediaElement::togglePlayState - canPlay() is %s", boolString(canPlay()));

// We can safely call the internal play/pause methods, which don't check restrictions, because

// this method is only called from the built-in media controller

@@ -2689,7 +2689,7 @@ void HTMLMediaElement::togglePlayState()

void HTMLMediaElement::beginScrubbing()

{

- LOG(Media, "HTMLMediaElement::beginScrubbing - paused() is %s", boolString(paused()));

+ LOG_INFO(Media, "HTMLMediaElement::beginScrubbing - paused() is %s", boolString(paused()));

if (!paused()) {

if (ended()) {

@@ -2708,7 +2708,7 @@ void HTMLMediaElement::beginScrubbing()

void HTMLMediaElement::endScrubbing()

{

- LOG(Media, "HTMLMediaElement::endScrubbing - m_pausedInternal is %s", boolString(m_pausedInternal));

+ LOG_INFO(Media, "HTMLMediaElement::endScrubbing - m_pausedInternal is %s", boolString(m_pausedInternal));

if (m_pausedInternal)

setPausedInternal(false);

@@ -3042,7 +3042,7 @@ void HTMLMediaElement::didRemoveTrack(HTMLTrackElement* trackElement)

#if !LOG_DISABLED

if (trackElement->hasTagName(trackTag)) {

KURL url = trackElement->getNonEmptyURLAttribute(srcAttr);

- LOG(Media, "HTMLMediaElement::didRemoveTrack - 'src' is %s", urlForLoggingMedia(url).utf8().data());

+ LOG_INFO(Media, "HTMLMediaElement::didRemoveTrack - 'src' is %s", urlForLoggingMedia(url).utf8().data());

}

#endif

@@ -3254,13 +3254,13 @@ KURL HTMLMediaElement::selectNextSourceChild(ContentType* contentType, String* k

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

bool shouldLog = actionIfInvalid != DoNothing;

if (shouldLog)

- LOG(Media, "HTMLMediaElement::selectNextSourceChild");

+ LOG_INFO(Media, "HTMLMediaElement::selectNextSourceChild");

#endif

if (!m_nextChildNodeToConsider) {

#if !LOG_DISABLED

if (shouldLog)

- LOG(Media, "HTMLMediaElement::selectNextSourceChild -> 0x0000, \"\"");

+ LOG_INFO(Media, "HTMLMediaElement::selectNextSourceChild -> 0x0000, \"\"");

#endif

return KURL();

}

@@ -3294,7 +3294,7 @@ KURL HTMLMediaElement::selectNextSourceChild(ContentType* contentType, String* k

mediaURL = source->getNonEmptyURLAttribute(srcAttr);

#if !LOG_DISABLED

if (shouldLog)

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

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

#endif

if (mediaURL.isEmpty())

goto check_again;

@@ -3304,7 +3304,7 @@ KURL HTMLMediaElement::selectNextSourceChild(ContentType* contentType, String* k

RefPtr<MediaQuerySet> media = MediaQuerySet::createAllowingDescriptionSyntax(source->media());

#if !LOG_DISABLED

if (shouldLog)

- LOG(Media, "HTMLMediaElement::selectNextSourceChild - 'media' is %s", source->media().utf8().data());

+ LOG_INFO(Media, "HTMLMediaElement::selectNextSourceChild - 'media' is %s", source->media().utf8().data());

#endif

if (!screenEval.eval(media.get()))

goto check_again;

@@ -3317,7 +3317,7 @@ KURL HTMLMediaElement::selectNextSourceChild(ContentType* contentType, String* k

if (!type.isEmpty() || !system.isEmpty()) {

#if !LOG_DISABLED

if (shouldLog)

- LOG(Media, "HTMLMediaElement::selectNextSourceChild - 'type' is '%s' - key system is '%s'", type.utf8().data(), system.utf8().data());

+ LOG_INFO(Media, "HTMLMediaElement::selectNextSourceChild - 'type' is '%s' - key system is '%s'", type.utf8().data(), system.utf8().data());

#endif

if (!MediaPlayer::supportsType(ContentType(type), system, mediaURL, this))

goto check_again;

@@ -3328,7 +3328,7 @@ KURL HTMLMediaElement::selectNextSourceChild(ContentType* contentType, String* k

// A 'beforeload' event handler can mutate the DOM, so check to see if the source element is still a child node.

if (node->parentNode() != this) {

- LOG(Media, "HTMLMediaElement::selectNextSourceChild : 'beforeload' removed current element");

+ LOG_INFO(Media, "HTMLMediaElement::selectNextSourceChild : 'beforeload' removed current element");

source = 0;

goto check_again;

}

@@ -3358,19 +3358,19 @@ check_again:

#if !LOG_DISABLED

if (shouldLog)

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

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

#endif

return canUseSourceElement ? mediaURL : KURL();

}

void HTMLMediaElement::sourceWasAdded(HTMLSourceElement* source)

{

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

+ LOG_INFO(Media, "HTMLMediaElement::sourceWasAdded(%p)", source);

#if !LOG_DISABLED

if (source->hasTagName(sourceTag)) {

KURL url = source->getNonEmptyURLAttribute(srcAttr);

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

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

}

#endif

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

}

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

- LOG(Media, "HTMLMediaElement::sourceWasAdded - <source> inserted immediately after current source");

+ LOG_INFO(Media, "HTMLMediaElement::sourceWasAdded - <source> inserted immediately after current source");

m_nextChildNodeToConsider = source;

return;

}

@@ -3413,12 +3413,12 @@ void HTMLMediaElement::sourceWasAdded(HTMLSourceElement* source)

void HTMLMediaElement::sourceWasRemoved(HTMLSourceElement* source)

{

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

+ LOG_INFO(Media, "HTMLMediaElement::sourceWasRemoved(%p)", source);

#if !LOG_DISABLED

if (source->hasTagName(sourceTag)) {

KURL url = source->getNonEmptyURLAttribute(srcAttr);

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

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

}

#endif

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

if (source == m_nextChildNodeToConsider) {

if (m_currentSourceNode)

m_nextChildNodeToConsider = m_currentSourceNode->nextSibling();

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

+ LOG_INFO(Media, "HTMLMediaElement::sourceRemoved - m_nextChildNodeToConsider set to %p", 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 = 0;

- LOG(Media, "HTMLMediaElement::sourceRemoved - m_currentSourceNode set to 0");

+ LOG_INFO(Media, "HTMLMediaElement::sourceRemoved - m_currentSourceNode set to 0");

}

void HTMLMediaElement::mediaPlayerTimeChanged(MediaPlayer*)

{

- LOG(Media, "HTMLMediaElement::mediaPlayerTimeChanged");

+ LOG_INFO(Media, "HTMLMediaElement::mediaPlayerTimeChanged");

#if ENABLE(VIDEO_TRACK)

if (RuntimeEnabledFeatures::webkitVideoTrackEnabled())

@@ -3499,7 +3499,7 @@ void HTMLMediaElement::mediaPlayerTimeChanged(MediaPlayer*)

void HTMLMediaElement::mediaPlayerVolumeChanged(MediaPlayer*)

{

- LOG(Media, "HTMLMediaElement::mediaPlayerVolumeChanged");

+ LOG_INFO(Media, "HTMLMediaElement::mediaPlayerVolumeChanged");

beginProcessingMediaPlayerCallback();

if (m_player) {

@@ -3515,7 +3515,7 @@ void HTMLMediaElement::mediaPlayerVolumeChanged(MediaPlayer*)

void HTMLMediaElement::mediaPlayerMuteChanged(MediaPlayer*)

{

- LOG(Media, "HTMLMediaElement::mediaPlayerMuteChanged");

+ LOG_INFO(Media, "HTMLMediaElement::mediaPlayerMuteChanged");

beginProcessingMediaPlayerCallback();

if (m_player)

@@ -3525,7 +3525,7 @@ void HTMLMediaElement::mediaPlayerMuteChanged(MediaPlayer*)

void HTMLMediaElement::mediaPlayerDurationChanged(MediaPlayer* player)

{

- LOG(Media, "HTMLMediaElement::mediaPlayerDurationChanged");

+ LOG_INFO(Media, "HTMLMediaElement::mediaPlayerDurationChanged");

beginProcessingMediaPlayerCallback();

@@ -3542,7 +3542,7 @@ void HTMLMediaElement::mediaPlayerDurationChanged(MediaPlayer* player)

void HTMLMediaElement::mediaPlayerRateChanged(MediaPlayer*)

{

- LOG(Media, "HTMLMediaElement::mediaPlayerRateChanged");

+ LOG_INFO(Media, "HTMLMediaElement::mediaPlayerRateChanged");

beginProcessingMediaPlayerCallback();

@@ -3561,7 +3561,7 @@ void HTMLMediaElement::mediaPlayerRateChanged(MediaPlayer*)

void HTMLMediaElement::mediaPlayerPlaybackStateChanged(MediaPlayer*)

{

- LOG(Media, "HTMLMediaElement::mediaPlayerPlaybackStateChanged");

+ LOG_INFO(Media, "HTMLMediaElement::mediaPlayerPlaybackStateChanged");

if (!m_player || m_pausedInternal)

return;

@@ -3576,7 +3576,7 @@ void HTMLMediaElement::mediaPlayerPlaybackStateChanged(MediaPlayer*)

void HTMLMediaElement::mediaPlayerSawUnsupportedTracks(MediaPlayer*)

{

- LOG(Media, "HTMLMediaElement::mediaPlayerSawUnsupportedTracks");

+ LOG_INFO(Media, "HTMLMediaElement::mediaPlayerSawUnsupportedTracks");

// The MediaPlayer came across content it cannot completely handle.

// This is normally acceptable except when we are in a standalone

@@ -3589,7 +3589,7 @@ void HTMLMediaElement::mediaPlayerSawUnsupportedTracks(MediaPlayer*)

void HTMLMediaElement::mediaPlayerResourceNotSupported(MediaPlayer*)

{

- LOG(Media, "HTMLMediaElement::mediaPlayerResourceNotSupported");

+ LOG_INFO(Media, "HTMLMediaElement::mediaPlayerResourceNotSupported");

// The MediaPlayer came across content which no installed engine supports.

mediaLoadingFailed(MediaPlayer::FormatError);

@@ -3607,7 +3607,7 @@ void HTMLMediaElement::mediaPlayerRepaint(MediaPlayer*)

void HTMLMediaElement::mediaPlayerSizeChanged(MediaPlayer*)

{

- LOG(Media, "HTMLMediaElement::mediaPlayerSizeChanged");

+ LOG_INFO(Media, "HTMLMediaElement::mediaPlayerSizeChanged");

beginProcessingMediaPlayerCallback();

if (renderer())

@@ -3627,7 +3627,7 @@ bool HTMLMediaElement::mediaPlayerRenderingCanBeAccelerated(MediaPlayer*)

void HTMLMediaElement::mediaPlayerRenderingModeChanged(MediaPlayer*)

{

- LOG(Media, "HTMLMediaElement::mediaPlayerRenderingModeChanged");

+ LOG_INFO(Media, "HTMLMediaElement::mediaPlayerRenderingModeChanged");

// Kick off a fake recalcStyle that will update the compositing tree.

setNeedsStyleRecalc(SyntheticStyleChange);

@@ -3646,7 +3646,7 @@ GraphicsDeviceAdapter* HTMLMediaElement::mediaPlayerGraphicsDeviceAdapter(const

void HTMLMediaElement::mediaPlayerEngineUpdated(MediaPlayer*)

{

- LOG(Media, "HTMLMediaElement::mediaPlayerEngineUpdated");

+ LOG_INFO(Media, "HTMLMediaElement::mediaPlayerEngineUpdated");

beginProcessingMediaPlayerCallback();

if (renderer())

renderer()->updateFromElement();

@@ -3655,7 +3655,7 @@ void HTMLMediaElement::mediaPlayerEngineUpdated(MediaPlayer*)

void HTMLMediaElement::mediaPlayerFirstVideoFrameAvailable(MediaPlayer*)

{

- LOG(Media, "HTMLMediaElement::mediaPlayerFirstVideoFrameAvailable");

+ LOG_INFO(Media, "HTMLMediaElement::mediaPlayerFirstVideoFrameAvailable");

beginProcessingMediaPlayerCallback();

if (displayMode() == PosterWaitingForVideo) {

setDisplayMode(Video);

@@ -3668,7 +3668,7 @@ void HTMLMediaElement::mediaPlayerFirstVideoFrameAvailable(MediaPlayer*)

void HTMLMediaElement::mediaPlayerCharacteristicChanged(MediaPlayer*)

{

- LOG(Media, "HTMLMediaElement::mediaPlayerCharacteristicChanged");

+ LOG_INFO(Media, "HTMLMediaElement::mediaPlayerCharacteristicChanged");

beginProcessingMediaPlayerCallback();

if (hasMediaControls())

@@ -3815,8 +3815,8 @@ void HTMLMediaElement::updatePlayState()

bool shouldBePlaying = potentiallyPlaying();

bool playerPaused = m_player->paused();

- LOG(Media, "HTMLMediaElement::updatePlayState - shouldBePlaying = %s, playerPaused = %s",

- boolString(shouldBePlaying), boolString(playerPaused));

+ LOG_INFO(Media, "HTMLMediaElement::updatePlayState - shouldBePlaying = %s, playerPaused = %s",

+ boolString(shouldBePlaying), boolString(playerPaused));

if (shouldBePlaying) {

setDisplayMode(Video);

@@ -3877,7 +3877,7 @@ void HTMLMediaElement::stopPeriodicTimers()

void HTMLMediaElement::userCancelledLoad()

{

- LOG(Media, "HTMLMediaElement::userCancelledLoad");

+ LOG_INFO(Media, "HTMLMediaElement::userCancelledLoad");

if (m_networkState == NETWORK_EMPTY || m_completelyLoaded)

return;

@@ -3963,7 +3963,7 @@ bool HTMLMediaElement::canSuspend() const

void HTMLMediaElement::stop()

{

- LOG(Media, "HTMLMediaElement::stop");

+ LOG_INFO(Media, "HTMLMediaElement::stop");

if (m_isFullscreen)

exitFullscreen();

@@ -3983,7 +3983,7 @@ void HTMLMediaElement::stop()

void HTMLMediaElement::suspend(ReasonForSuspension why)

{

- LOG(Media, "HTMLMediaElement::suspend");

+ LOG_INFO(Media, "HTMLMediaElement::suspend");

switch (why)

{

@@ -4000,7 +4000,7 @@ void HTMLMediaElement::suspend(ReasonForSuspension why)

void HTMLMediaElement::resume()

{

- LOG(Media, "HTMLMediaElement::resume");

+ LOG_INFO(Media, "HTMLMediaElement::resume");

m_inActiveDocument = true;

setPausedInternal(false);

@@ -4025,7 +4025,7 @@ bool HTMLMediaElement::hasPendingActivity() const

void HTMLMediaElement::mediaVolumeDidChange()

{

- LOG(Media, "HTMLMediaElement::mediaVolumeDidChange");

+ LOG_INFO(Media, "HTMLMediaElement::mediaVolumeDidChange");

updateVolume();

}

@@ -4133,7 +4133,7 @@ void HTMLMediaElement::createMediaPlayerProxy()

if (!frame)

return;

- LOG(Media, "HTMLMediaElement::createMediaPlayerProxy");

+ LOG_INFO(Media, "HTMLMediaElement::createMediaPlayerProxy");

KURL url;

Vector<String> paramNames;

@@ -4180,7 +4180,7 @@ bool HTMLMediaElement::isFullscreen() const

void HTMLMediaElement::enterFullscreen()

{

- LOG(Media, "HTMLMediaElement::enterFullscreen");

+ LOG_INFO(Media, "HTMLMediaElement::enterFullscreen");

#if ENABLE(FULLSCREEN_API)

if (document() && document()->settings() && document()->settings()->fullScreenEnabled()) {

@@ -4200,7 +4200,7 @@ void HTMLMediaElement::enterFullscreen()

void HTMLMediaElement::exitFullscreen()

{

- LOG(Media, "HTMLMediaElement::exitFullscreen");

+ LOG_INFO(Media, "HTMLMediaElement::exitFullscreen");

#if ENABLE(FULLSCREEN_API)

if (document() && document()->settings() && document()->settings()->fullScreenEnabled()) {

@@ -4281,7 +4281,7 @@ void HTMLMediaElement::updateTextTrackDisplay()

void HTMLMediaElement::setClosedCaptionsVisible(bool closedCaptionVisible)

{

- LOG(Media, "HTMLMediaElement::setClosedCaptionsVisible(%s)", boolString(closedCaptionVisible));

+ LOG_INFO(Media, "HTMLMediaElement::setClosedCaptionsVisible(%s)", boolString(closedCaptionVisible));

if (!m_player || !hasClosedCaptions())

return;

@@ -4335,7 +4335,7 @@ unsigned HTMLMediaElement::webkitVideoDecodedByteCount() const

void HTMLMediaElement::mediaCanStart()

{

- LOG(Media, "HTMLMediaElement::mediaCanStart");

+ LOG_INFO(Media, "HTMLMediaElement::mediaCanStart");

ASSERT(m_isWaitingUntilMediaCanStart);

m_isWaitingUntilMediaCanStart = false;

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

if (m_shouldDelayLoadEvent == shouldDelay)

return;

- LOG(Media, "HTMLMediaElement::setShouldDelayLoadEvent(%s)", boolString(shouldDelay));

+ LOG_INFO(Media, "HTMLMediaElement::setShouldDelayLoadEvent(%s)", boolString(shouldDelay));

m_shouldDelayLoadEvent = shouldDelay;

if (shouldDelay)

@@ -4389,7 +4389,7 @@ void HTMLMediaElement::privateBrowsingStateDidChange()

Settings* settings = document()->settings();

bool privateMode = !settings || settings->privateBrowsingEnabled();

- LOG(Media, "HTMLMediaElement::privateBrowsingStateDidChange(%s)", boolString(privateMode));

+ LOG_INFO(Media, "HTMLMediaElement::privateBrowsingStateDidChange(%s)", boolString(privateMode));

m_player->setPrivateBrowsingMode(privateMode);

}

« no previous file with comments | « Source/WebCore/html/FTPDirectoryDocument.cpp ('k') | Source/WebCore/html/HTMLPlugInImageElement.cpp » ('j') | no next file with comments »