Index: content/renderer/render_thread_impl.cc |
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
index 7ad666e691fad4a380efc4222afa5ffc16df49ba..d64ad7729c0d1d8a69d78d54a9a5c71b6067e6c7 100644 |
--- a/content/renderer/render_thread_impl.cc |
+++ b/content/renderer/render_thread_impl.cc |
@@ -647,7 +647,10 @@ void RenderThreadImpl::Init() { |
// Note that under Linux, the media library will normally already have |
// been initialized by the Zygote before this instance became a Renderer. |
- media::InitializeMediaLibrary(); |
+ base::FilePath media_path; |
+ PathService::Get(DIR_MEDIA_LIBS, &media_path); |
+ if (!media_path.empty()) |
+ media::InitializeMediaLibrary(media_path); |
memory_pressure_listener_.reset(new base::MemoryPressureListener( |
base::Bind(&RenderThreadImpl::OnMemoryPressure, base::Unretained(this)))); |
@@ -1104,6 +1107,10 @@ void RenderThreadImpl::EnsureWebKitInitialized() { |
EnableBlinkPlatformLogChannels( |
command_line.GetSwitchValueASCII(switches::kBlinkPlatformLogChannels)); |
+ if (!media::IsMediaLibraryInitialized()) { |
+ WebRuntimeFeatures::enableWebAudio(false); |
+ } |
+ |
RenderMediaClient::Initialize(); |
FOR_EACH_OBSERVER(RenderProcessObserver, observers_, WebKitInitialized()); |