| 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/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" |
| (...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 789 switches::kEnableSandboxLogging, | 789 switches::kEnableSandboxLogging, |
| 790 #endif | 790 #endif |
| 791 switches::kGpuNoContextLost, | 791 switches::kGpuNoContextLost, |
| 792 switches::kGpuStartupDialog, | 792 switches::kGpuStartupDialog, |
| 793 switches::kLoggingLevel, | 793 switches::kLoggingLevel, |
| 794 switches::kNoSandbox, | 794 switches::kNoSandbox, |
| 795 switches::kTestGLLib, | 795 switches::kTestGLLib, |
| 796 switches::kTraceStartup, | 796 switches::kTraceStartup, |
| 797 switches::kV, | 797 switches::kV, |
| 798 switches::kVModule, | 798 switches::kVModule, |
| 799 switches::kEnableUIReleaseFrontSurface, |
| 799 #if defined(USE_AURA) | 800 #if defined(USE_AURA) |
| 800 switches::kUIPrioritizeInGpuProcess, | 801 switches::kUIPrioritizeInGpuProcess, |
| 801 #endif | 802 #endif |
| 802 }; | 803 }; |
| 803 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 804 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| 804 arraysize(kSwitchNames)); | 805 arraysize(kSwitchNames)); |
| 805 cmd_line->CopySwitchesFrom( | 806 cmd_line->CopySwitchesFrom( |
| 806 browser_command_line, switches::kGpuSwitches, switches::kNumGpuSwitches); | 807 browser_command_line, switches::kGpuSwitches, switches::kNumGpuSwitches); |
| 807 | 808 |
| 808 content::GetContentClient()->browser()->AppendExtraCommandLineSwitches( | 809 content::GetContentClient()->browser()->AppendExtraCommandLineSwitches( |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 858 const IPC::ChannelHandle& channel_handle, | 859 const IPC::ChannelHandle& channel_handle, |
| 859 base::ProcessHandle renderer_process_for_gpu, | 860 base::ProcessHandle renderer_process_for_gpu, |
| 860 const content::GPUInfo& gpu_info) { | 861 const content::GPUInfo& gpu_info) { |
| 861 callback.Run(channel_handle, gpu_info); | 862 callback.Run(channel_handle, gpu_info); |
| 862 } | 863 } |
| 863 | 864 |
| 864 void GpuProcessHost::CreateCommandBufferError( | 865 void GpuProcessHost::CreateCommandBufferError( |
| 865 const CreateCommandBufferCallback& callback, int32 route_id) { | 866 const CreateCommandBufferCallback& callback, int32 route_id) { |
| 866 callback.Run(route_id); | 867 callback.Run(route_id); |
| 867 } | 868 } |
| OLD | NEW |