| 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 <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 746 | 746 |
| 747 // 1) Need to initialize in-process GpuDataManager before creating threads. | 747 // 1) Need to initialize in-process GpuDataManager before creating threads. |
| 748 // It's unsafe to append the gpu command line switches to the global | 748 // It's unsafe to append the gpu command line switches to the global |
| 749 // CommandLine::ForCurrentProcess object after threads are created. | 749 // CommandLine::ForCurrentProcess object after threads are created. |
| 750 // 2) Must be after parts_->PreCreateThreads to pick up chrome://flags. | 750 // 2) Must be after parts_->PreCreateThreads to pick up chrome://flags. |
| 751 GpuDataManagerImpl::GetInstance()->Initialize(); | 751 GpuDataManagerImpl::GetInstance()->Initialize(); |
| 752 | 752 |
| 753 #if defined(USE_X11) && !defined(OS_CHROMEOS) | 753 #if defined(USE_X11) && !defined(OS_CHROMEOS) |
| 754 // PreCreateThreads is called before CreateStartupTasks which starts the gpu | 754 // PreCreateThreads is called before CreateStartupTasks which starts the gpu |
| 755 // process. | 755 // process. |
| 756 bool enable_transparent_visuals = | 756 bool enable_transparent_visuals = false; |
| 757 !GpuDataManagerImpl::GetInstance()->IsDriverBugWorkaroundActive( | |
| 758 gpu::DISABLE_TRANSPARENT_VISUALS); | |
| 759 | 757 |
| 760 // Prevent this flag to be turned off later since it is only used here. | 758 // Prevent this flag to be turned off later since it is only used here. |
| 761 if (!enable_transparent_visuals && | 759 if (!GpuDataManagerImpl::GetInstance()->IsCompleteGpuInfoAvailable()) { |
| 762 !GpuDataManagerImpl::GetInstance()->IsCompleteGpuInfoAvailable()) { | |
| 763 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 760 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 764 "disable_transparent_visuals"); | 761 "disable_transparent_visuals"); |
| 765 } | 762 } |
| 766 | 763 |
| 767 Visual* visual = NULL; | 764 Visual* visual = NULL; |
| 768 int depth = 0; | 765 int depth = 0; |
| 769 ui::ChooseVisualForWindow(enable_transparent_visuals, &visual, &depth); | 766 ui::ChooseVisualForWindow(enable_transparent_visuals, &visual, &depth); |
| 770 DCHECK(depth > 0); | 767 DCHECK(depth > 0); |
| 771 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( | 768 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
| 772 switches::kWindowDepth, base::IntToString(depth)); | 769 switches::kWindowDepth, base::IntToString(depth)); |
| (...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1540 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = | 1537 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = |
| 1541 audio_thread_->task_runner(); | 1538 audio_thread_->task_runner(); |
| 1542 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), | 1539 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), |
| 1543 std::move(worker_task_runner), | 1540 std::move(worker_task_runner), |
| 1544 MediaInternals::GetInstance()); | 1541 MediaInternals::GetInstance()); |
| 1545 } | 1542 } |
| 1546 CHECK(audio_manager_); | 1543 CHECK(audio_manager_); |
| 1547 } | 1544 } |
| 1548 | 1545 |
| 1549 } // namespace content | 1546 } // namespace content |
| OLD | NEW |