| Index: third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.cpp
|
| diff --git a/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.cpp b/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.cpp
|
| index 87926f2309d2a88112d1b33e532f487f6d2bd826..c581d615026a9552873303a368383db37c4c9501 100644
|
| --- a/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.cpp
|
| +++ b/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.cpp
|
| @@ -135,9 +135,9 @@ void MediaElementAudioSourceHandler::onCurrentSrcChanged(
|
| m_passesCurrentSrcCORSAccessCheck =
|
| passesCurrentSrcCORSAccessCheck(currentSrc);
|
|
|
| - // Make a note if we need to print a console message and save the |curentSrc| for use in the
|
| - // message. Need to wait until later to print the message in case HTMLMediaElement allows
|
| - // access.
|
| + // Make a note if we need to print a console message and save the |curentSrc|
|
| + // for use in the message. Need to wait until later to print the message in
|
| + // case HTMLMediaElement allows access.
|
| m_maybePrintCORSMessage = !m_passesCurrentSrcCORSAccessCheck;
|
| m_currentSrcString = currentSrc.getString();
|
| }
|
| @@ -163,8 +163,9 @@ void MediaElementAudioSourceHandler::process(size_t numberOfFrames) {
|
| AudioBus* outputBus = output(0).bus();
|
|
|
| // Use a tryLock() to avoid contention in the real-time audio thread.
|
| - // If we fail to acquire the lock then the HTMLMediaElement must be in the middle of
|
| - // reconfiguring its playback engine, so we output silence in this case.
|
| + // If we fail to acquire the lock then the HTMLMediaElement must be in the
|
| + // middle of reconfiguring its playback engine, so we output silence in this
|
| + // case.
|
| MutexTryLocker tryLocker(m_processLock);
|
| if (tryLocker.locked()) {
|
| if (!mediaElement() || !m_sourceNumberOfChannels || !m_sourceSampleRate) {
|
| @@ -172,21 +173,22 @@ void MediaElementAudioSourceHandler::process(size_t numberOfFrames) {
|
| return;
|
| }
|
| AudioSourceProvider& provider = mediaElement()->getAudioSourceProvider();
|
| - // Grab data from the provider so that the element continues to make progress, even if
|
| - // we're going to output silence anyway.
|
| + // Grab data from the provider so that the element continues to make
|
| + // progress, even if we're going to output silence anyway.
|
| if (m_multiChannelResampler.get()) {
|
| DCHECK_NE(m_sourceSampleRate, sampleRate());
|
| m_multiChannelResampler->process(&provider, outputBus, numberOfFrames);
|
| } else {
|
| - // Bypass the resampler completely if the source is at the context's sample-rate.
|
| + // Bypass the resampler completely if the source is at the context's
|
| + // sample-rate.
|
| DCHECK_EQ(m_sourceSampleRate, sampleRate());
|
| provider.provideInput(outputBus, numberOfFrames);
|
| }
|
| // Output silence if we don't have access to the element.
|
| if (!passesCORSAccessCheck()) {
|
| if (m_maybePrintCORSMessage) {
|
| - // Print a CORS message, but just once for each change in the current media
|
| - // element source, and only if we have a document to print to.
|
| + // Print a CORS message, but just once for each change in the current
|
| + // media element source, and only if we have a document to print to.
|
| m_maybePrintCORSMessage = false;
|
| if (context()->getExecutionContext()) {
|
| context()->getExecutionContext()->postTask(
|
|
|