OLD | NEW |
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 <algorithm> | 9 #include <algorithm> |
10 #include <string> | 10 #include <string> |
(...skipping 1457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1468 ImageTransportFactory::Initialize(); | 1468 ImageTransportFactory::Initialize(); |
1469 ImageTransportFactory::GetInstance()->SetGpuChannelEstablishFactory(factory); | 1469 ImageTransportFactory::GetInstance()->SetGpuChannelEstablishFactory(factory); |
1470 #if defined(USE_AURA) | 1470 #if defined(USE_AURA) |
1471 if (env_->mode() == aura::Env::Mode::LOCAL) { | 1471 if (env_->mode() == aura::Env::Mode::LOCAL) { |
1472 env_->set_context_factory(GetContextFactory()); | 1472 env_->set_context_factory(GetContextFactory()); |
1473 env_->set_context_factory_private(GetContextFactoryPrivate()); | 1473 env_->set_context_factory_private(GetContextFactoryPrivate()); |
1474 } | 1474 } |
1475 #endif // defined(USE_AURA) | 1475 #endif // defined(USE_AURA) |
1476 #endif // defined(OS_ANDROID) | 1476 #endif // defined(OS_ANDROID) |
1477 | 1477 |
1478 // Enable the GpuMemoryBuffer dump provider with IO thread affinity. Note that | |
1479 // unregistration happens on the IO thread (See | |
1480 // BrowserProcessSubThread::IOThreadPreCleanUp). | |
1481 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | |
1482 BrowserGpuMemoryBufferManager::current(), "BrowserGpuMemoryBufferManager", | |
1483 io_thread_->task_runner()); | |
1484 #if defined(OS_ANDROID) | 1478 #if defined(OS_ANDROID) |
1485 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 1479 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
1486 tracing::GraphicsMemoryDumpProvider::GetInstance(), "AndroidGraphics", | 1480 tracing::GraphicsMemoryDumpProvider::GetInstance(), "AndroidGraphics", |
1487 nullptr); | 1481 nullptr); |
1488 #endif | 1482 #endif |
1489 | 1483 |
1490 { | 1484 { |
1491 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan"); | 1485 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan"); |
1492 CreateAudioManager(); | 1486 CreateAudioManager(); |
1493 } | 1487 } |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1780 base::MakeUnique<media::AudioThreadImpl>(), | 1774 base::MakeUnique<media::AudioThreadImpl>(), |
1781 MediaInternals::GetInstance()); | 1775 MediaInternals::GetInstance()); |
1782 } | 1776 } |
1783 CHECK(audio_manager_); | 1777 CHECK(audio_manager_); |
1784 | 1778 |
1785 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); | 1779 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); |
1786 CHECK(audio_system_); | 1780 CHECK(audio_system_); |
1787 } | 1781 } |
1788 | 1782 |
1789 } // namespace content | 1783 } // namespace content |
OLD | NEW |