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

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 2784433002: Ensures that audio tasks cannot run after AudioManager is deleted. (Closed)
Patch Set: addressed comments Created 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "base/timer/hi_res_timer_manager.h" 44 #include "base/timer/hi_res_timer_manager.h"
45 #include "base/trace_event/memory_dump_manager.h" 45 #include "base/trace_event/memory_dump_manager.h"
46 #include "base/trace_event/trace_event.h" 46 #include "base/trace_event/trace_event.h"
47 #include "build/build_config.h" 47 #include "build/build_config.h"
48 #include "components/discardable_memory/service/discardable_shared_memory_manage r.h" 48 #include "components/discardable_memory/service/discardable_shared_memory_manage r.h"
49 #include "components/display_compositor/host_shared_bitmap_manager.h" 49 #include "components/display_compositor/host_shared_bitmap_manager.h"
50 #include "components/tracing/common/process_metrics_memory_dump_provider.h" 50 #include "components/tracing/common/process_metrics_memory_dump_provider.h"
51 #include "components/tracing/common/trace_config_file.h" 51 #include "components/tracing/common/trace_config_file.h"
52 #include "components/tracing/common/trace_to_console.h" 52 #include "components/tracing/common/trace_to_console.h"
53 #include "components/tracing/common/tracing_switches.h" 53 #include "components/tracing/common/tracing_switches.h"
54 #include "content/browser/audio_manager_thread.h"
55 #include "content/browser/browser_thread_impl.h" 54 #include "content/browser/browser_thread_impl.h"
56 #include "content/browser/dom_storage/dom_storage_area.h" 55 #include "content/browser/dom_storage/dom_storage_area.h"
57 #include "content/browser/download/download_resource_handler.h" 56 #include "content/browser/download/download_resource_handler.h"
58 #include "content/browser/download/save_file_manager.h" 57 #include "content/browser/download/save_file_manager.h"
59 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" 58 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
60 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" 59 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
61 #include "content/browser/gpu/compositor_util.h" 60 #include "content/browser/gpu/compositor_util.h"
62 #include "content/browser/gpu/gpu_data_manager_impl.h" 61 #include "content/browser/gpu/gpu_data_manager_impl.h"
63 #include "content/browser/gpu/gpu_process_host.h" 62 #include "content/browser/gpu/gpu_process_host.h"
64 #include "content/browser/gpu/shader_cache_factory.h" 63 #include "content/browser/gpu/shader_cache_factory.h"
(...skipping 20 matching lines...) Expand all
85 #include "content/public/browser/gpu_data_manager_observer.h" 84 #include "content/public/browser/gpu_data_manager_observer.h"
86 #include "content/public/browser/render_process_host.h" 85 #include "content/public/browser/render_process_host.h"
87 #include "content/public/browser/tracing_controller.h" 86 #include "content/public/browser/tracing_controller.h"
88 #include "content/public/common/content_client.h" 87 #include "content/public/common/content_client.h"
89 #include "content/public/common/content_features.h" 88 #include "content/public/common/content_features.h"
90 #include "content/public/common/content_switches.h" 89 #include "content/public/common/content_switches.h"
91 #include "content/public/common/main_function_params.h" 90 #include "content/public/common/main_function_params.h"
92 #include "content/public/common/result_codes.h" 91 #include "content/public/common/result_codes.h"
93 #include "device/gamepad/gamepad_service.h" 92 #include "device/gamepad/gamepad_service.h"
94 #include "gpu/vulkan/features.h" 93 #include "gpu/vulkan/features.h"
94 #include "media/audio/audio_manager.h"
95 #include "media/audio/audio_system_impl.h" 95 #include "media/audio/audio_system_impl.h"
96 #include "media/audio/audio_thread_impl.h"
96 #include "media/base/media.h" 97 #include "media/base/media.h"
97 #include "media/base/user_input_monitor.h" 98 #include "media/base/user_input_monitor.h"
98 #include "media/midi/midi_service.h" 99 #include "media/midi/midi_service.h"
99 #include "mojo/edk/embedder/embedder.h" 100 #include "mojo/edk/embedder/embedder.h"
100 #include "mojo/edk/embedder/scoped_ipc_support.h" 101 #include "mojo/edk/embedder/scoped_ipc_support.h"
101 #include "net/base/network_change_notifier.h" 102 #include "net/base/network_change_notifier.h"
102 #include "net/socket/client_socket_factory.h" 103 #include "net/socket/client_socket_factory.h"
103 #include "net/ssl/ssl_config_service.h" 104 #include "net/ssl/ssl_config_service.h"
104 #include "ppapi/features/features.h" 105 #include "ppapi/features/features.h"
105 #include "services/resource_coordinator/memory/coordinator/coordinator_impl.h" 106 #include "services/resource_coordinator/memory/coordinator/coordinator_impl.h"
(...skipping 1252 matching lines...) Expand 10 before | Expand all | Expand 10 after
1358 // Must happen after the I/O thread is shutdown since this class lives on the 1359 // Must happen after the I/O thread is shutdown since this class lives on the
1359 // I/O thread and isn't threadsafe. 1360 // I/O thread and isn't threadsafe.
1360 { 1361 {
1361 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:GamepadService"); 1362 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:GamepadService");
1362 device::GamepadService::GetInstance()->Terminate(); 1363 device::GamepadService::GetInstance()->Terminate();
1363 } 1364 }
1364 { 1365 {
1365 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:DeleteDataSources"); 1366 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:DeleteDataSources");
1366 URLDataManager::DeleteDataSources(); 1367 URLDataManager::DeleteDataSources();
1367 } 1368 }
1369 {
1370 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:AudioMan");
1371 audio_manager_->Shutdown();
1372 }
1368 1373
1369 if (parts_) { 1374 if (parts_) {
1370 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:PostDestroyThreads"); 1375 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:PostDestroyThreads");
1371 parts_->PostDestroyThreads(); 1376 parts_->PostDestroyThreads();
1372 } 1377 }
1373 } 1378 }
1374 1379
1375 void BrowserMainLoop::StopStartupTracingTimer() { 1380 void BrowserMainLoop::StopStartupTracingTimer() {
1376 startup_trace_timer_.Stop(); 1381 startup_trace_timer_.Stop();
1377 } 1382 }
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
1752 DCHECK(is_tracing_startup_for_duration_); 1757 DCHECK(is_tracing_startup_for_duration_);
1753 1758
1754 is_tracing_startup_for_duration_ = false; 1759 is_tracing_startup_for_duration_ = false;
1755 TracingController::GetInstance()->StopTracing( 1760 TracingController::GetInstance()->StopTracing(
1756 TracingController::CreateFileSink( 1761 TracingController::CreateFileSink(
1757 startup_trace_file_, 1762 startup_trace_file_,
1758 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1763 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1759 } 1764 }
1760 1765
1761 void BrowserMainLoop::CreateAudioManager() { 1766 void BrowserMainLoop::CreateAudioManager() {
1762 DCHECK(!audio_thread_);
1763 DCHECK(!audio_manager_); 1767 DCHECK(!audio_manager_);
1764 1768
1765 audio_manager_ = GetContentClient()->browser()->CreateAudioManager( 1769 audio_manager_ = GetContentClient()->browser()->CreateAudioManager(
1766 MediaInternals::GetInstance()); 1770 MediaInternals::GetInstance());
1767 if (!audio_manager_) { 1771 if (!audio_manager_) {
1768 audio_thread_ = base::MakeUnique<AudioManagerThread>();
1769 audio_manager_ = media::AudioManager::Create( 1772 audio_manager_ = media::AudioManager::Create(
1770 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), 1773 base::MakeUnique<media::AudioThreadImpl>(),
1771 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), 1774 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
1772 MediaInternals::GetInstance()); 1775 MediaInternals::GetInstance());
1773 } 1776 }
1774 CHECK(audio_manager_); 1777 CHECK(audio_manager_);
1775 1778
1776 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); 1779 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());
1777 CHECK(audio_system_); 1780 CHECK(audio_system_);
1778 } 1781 }
1779 1782
1780 } // namespace content 1783 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698