Update to Chromium revision 131752.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@587 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-04-11 19:37:06 +00:00
parent 9d200c109a
commit b061ea934e
5 changed files with 15 additions and 13 deletions

View File

@@ -30,10 +30,11 @@
#include "base/process_util.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "media/audio/null_audio_sink.h"
#include "media/base/filter_collection.h"
#include "media/base/media_log.h"
#include "media/base/message_loop_factory.h"
#include "media/filters/null_audio_renderer.h"
#include "media/filters/audio_renderer_impl.h"
#include "net/base/net_errors.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
@@ -677,7 +678,8 @@ WebMediaPlayer* BrowserWebViewDelegate::createMediaPlayer(
// Add the audio renderer.
// TODO(vrk): Re-enable audio. (crbug.com/112159)
collection->AddAudioRenderer(new media::NullAudioRenderer());
collection->AddAudioRenderer(
new media::AudioRendererImpl(new media::NullAudioSink()));
return new webkit_media::WebMediaPlayerImpl(
frame,