OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/base_switches.h" | 9 #include "base/base_switches.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
562 switches::kDisableLogging, | 562 switches::kDisableLogging, |
563 switches::kEnableGPUServiceLogging, | 563 switches::kEnableGPUServiceLogging, |
564 switches::kEnableLogging, | 564 switches::kEnableLogging, |
565 #if defined(OS_MACOSX) | 565 #if defined(OS_MACOSX) |
566 switches::kEnableSandboxLogging, | 566 switches::kEnableSandboxLogging, |
567 #endif | 567 #endif |
568 switches::kGpuNoContextLost, | 568 switches::kGpuNoContextLost, |
569 switches::kGpuStartupDialog, | 569 switches::kGpuStartupDialog, |
570 switches::kLoggingLevel, | 570 switches::kLoggingLevel, |
571 switches::kNoSandbox, | 571 switches::kNoSandbox, |
| 572 switches::kTraceStartup, |
572 }; | 573 }; |
573 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 574 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
574 arraysize(kSwitchNames)); | 575 arraysize(kSwitchNames)); |
575 | 576 |
576 // If --ignore-gpu-blacklist is passed in, don't send in crash reports | 577 // If --ignore-gpu-blacklist is passed in, don't send in crash reports |
577 // because GPU is expected to be unreliable. | 578 // because GPU is expected to be unreliable. |
578 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) && | 579 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) && |
579 !cmd_line->HasSwitch(switches::kDisableBreakpad)) | 580 !cmd_line->HasSwitch(switches::kDisableBreakpad)) |
580 cmd_line->AppendSwitch(switches::kDisableBreakpad); | 581 cmd_line->AppendSwitch(switches::kDisableBreakpad); |
581 | 582 |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
620 const IPC::ChannelHandle& channel_handle, | 621 const IPC::ChannelHandle& channel_handle, |
621 base::ProcessHandle renderer_process_for_gpu, | 622 base::ProcessHandle renderer_process_for_gpu, |
622 const content::GPUInfo& gpu_info) { | 623 const content::GPUInfo& gpu_info) { |
623 callback.Run(channel_handle, renderer_process_for_gpu, gpu_info); | 624 callback.Run(channel_handle, renderer_process_for_gpu, gpu_info); |
624 } | 625 } |
625 | 626 |
626 void GpuProcessHost::CreateCommandBufferError( | 627 void GpuProcessHost::CreateCommandBufferError( |
627 const CreateCommandBufferCallback& callback, int32 route_id) { | 628 const CreateCommandBufferCallback& callback, int32 route_id) { |
628 callback.Run(route_id); | 629 callback.Run(route_id); |
629 } | 630 } |
OLD | NEW |