OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
Ami GONE FROM CHROMIUM
2012/03/21 13:16:24
I think the CL description has a bit of copy/paste
| |
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/gpu/gpu_process_host.h" | 5 #include "content/browser/gpu/gpu_process_host.h" |
6 | 6 |
7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/debug/trace_event.h" | 11 #include "base/debug/trace_event.h" |
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
695 switches::kEnableLogging, | 695 switches::kEnableLogging, |
696 #if defined(OS_MACOSX) | 696 #if defined(OS_MACOSX) |
697 switches::kEnableSandboxLogging, | 697 switches::kEnableSandboxLogging, |
698 #endif | 698 #endif |
699 switches::kGpuNoContextLost, | 699 switches::kGpuNoContextLost, |
700 switches::kGpuStartupDialog, | 700 switches::kGpuStartupDialog, |
701 switches::kLoggingLevel, | 701 switches::kLoggingLevel, |
702 switches::kNoSandbox, | 702 switches::kNoSandbox, |
703 switches::kTestGLLib, | 703 switches::kTestGLLib, |
704 switches::kTraceStartup, | 704 switches::kTraceStartup, |
705 switches::kEnableVaapiDecodeAcceleration, | |
Ami GONE FROM CHROMIUM
2012/03/21 13:16:24
Keep sorted?
Pawel Osciak
2012/04/05 10:37:20
Done.
| |
705 }; | 706 }; |
706 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 707 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
707 arraysize(kSwitchNames)); | 708 arraysize(kSwitchNames)); |
708 | 709 |
709 content::GetContentClient()->browser()->AppendExtraCommandLineSwitches( | 710 content::GetContentClient()->browser()->AppendExtraCommandLineSwitches( |
710 cmd_line, process_->GetData().id); | 711 cmd_line, process_->GetData().id); |
711 | 712 |
712 GpuDataManagerImpl::GetInstance()->AppendGpuCommandLine(cmd_line); | 713 GpuDataManagerImpl::GetInstance()->AppendGpuCommandLine(cmd_line); |
713 | 714 |
714 if (cmd_line->HasSwitch(switches::kUseGL)) | 715 if (cmd_line->HasSwitch(switches::kUseGL)) |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
753 const IPC::ChannelHandle& channel_handle, | 754 const IPC::ChannelHandle& channel_handle, |
754 base::ProcessHandle renderer_process_for_gpu, | 755 base::ProcessHandle renderer_process_for_gpu, |
755 const content::GPUInfo& gpu_info) { | 756 const content::GPUInfo& gpu_info) { |
756 callback.Run(channel_handle, renderer_process_for_gpu, gpu_info); | 757 callback.Run(channel_handle, renderer_process_for_gpu, gpu_info); |
757 } | 758 } |
758 | 759 |
759 void GpuProcessHost::CreateCommandBufferError( | 760 void GpuProcessHost::CreateCommandBufferError( |
760 const CreateCommandBufferCallback& callback, int32 route_id) { | 761 const CreateCommandBufferCallback& callback, int32 route_id) { |
761 callback.Run(route_id); | 762 callback.Run(route_id); |
762 } | 763 } |
OLD | NEW |