Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2791)

Unified Diff: content/renderer/render_thread_impl.cc

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling DEPS to pick up ffmpeg GYP changes Created 5 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: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 06d39406feb80babf7e9f34b37fff623180d0507..41d78b2be9131ab47c8e87830d164584e6ced9ae 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -647,10 +647,7 @@ 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.
- base::FilePath media_path;
- PathService::Get(DIR_MEDIA_LIBS, &media_path);
- if (!media_path.empty())
- media::InitializeMediaLibrary(media_path);
+ media::InitializeMediaLibrary();
memory_pressure_listener_.reset(new base::MemoryPressureListener(
base::Bind(&RenderThreadImpl::OnMemoryPressure, base::Unretained(this))));
@@ -1107,10 +1104,6 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
EnableBlinkPlatformLogChannels(
command_line.GetSwitchValueASCII(switches::kBlinkPlatformLogChannels));
- if (!media::IsMediaLibraryInitialized()) {
- WebRuntimeFeatures::enableWebAudio(false);
- }
-
RenderMediaClient::Initialize();
FOR_EACH_OBSERVER(RenderProcessObserver, observers_, WebKitInitialized());

Powered by Google App Engine
This is Rietveld 408576698