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 28 matching lines...) Expand all Loading... | |
39 #include "ui/gl/gl_switches.h" | 39 #include "ui/gl/gl_switches.h" |
40 | 40 |
41 #if defined(TOOLKIT_GTK) | 41 #if defined(TOOLKIT_GTK) |
42 #include "ui/gfx/gtk_native_view_id_manager.h" | 42 #include "ui/gfx/gtk_native_view_id_manager.h" |
43 #endif | 43 #endif |
44 | 44 |
45 #if defined(OS_WIN) | 45 #if defined(OS_WIN) |
46 #include "ui/surface/accelerated_surface_win.h" | 46 #include "ui/surface/accelerated_surface_win.h" |
47 #endif | 47 #endif |
48 | 48 |
49 namespace content { | 49 namespace content { |
Ami GONE FROM CHROMIUM
2012/11/02 17:57:06
If you rebase during a CR, your reviewer is gonna
sheu
2012/11/03 00:37:14
Gotcha, thanks.
| |
50 | 50 |
51 bool GpuProcessHost::gpu_enabled_ = true; | 51 bool GpuProcessHost::gpu_enabled_ = true; |
52 bool GpuProcessHost::hardware_gpu_enabled_ = true; | 52 bool GpuProcessHost::hardware_gpu_enabled_ = true; |
53 | 53 |
54 namespace { | 54 namespace { |
55 | 55 |
56 enum GPUProcessLifetimeEvent { | 56 enum GPUProcessLifetimeEvent { |
57 LAUNCHED, | 57 LAUNCHED, |
58 DIED_FIRST_TIME, | 58 DIED_FIRST_TIME, |
59 DIED_SECOND_TIME, | 59 DIED_SECOND_TIME, |
(...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
878 switches::kNoSandbox, | 878 switches::kNoSandbox, |
879 switches::kTestGLLib, | 879 switches::kTestGLLib, |
880 switches::kTraceStartup, | 880 switches::kTraceStartup, |
881 switches::kV, | 881 switches::kV, |
882 switches::kVModule, | 882 switches::kVModule, |
883 switches::kEnableUIReleaseFrontSurface, | 883 switches::kEnableUIReleaseFrontSurface, |
884 #if defined(USE_AURA) | 884 #if defined(USE_AURA) |
885 switches::kUIPrioritizeInGpuProcess, | 885 switches::kUIPrioritizeInGpuProcess, |
886 #endif | 886 #endif |
887 switches::kCrashOnGpuHang, | 887 switches::kCrashOnGpuHang, |
888 switches::kUseExynosVda, | |
888 }; | 889 }; |
889 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 890 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
890 arraysize(kSwitchNames)); | 891 arraysize(kSwitchNames)); |
891 cmd_line->CopySwitchesFrom( | 892 cmd_line->CopySwitchesFrom( |
892 browser_command_line, switches::kGpuSwitches, switches::kNumGpuSwitches); | 893 browser_command_line, switches::kGpuSwitches, switches::kNumGpuSwitches); |
893 | 894 |
894 GetContentClient()->browser()->AppendExtraCommandLineSwitches( | 895 GetContentClient()->browser()->AppendExtraCommandLineSwitches( |
895 cmd_line, process_->GetData().id); | 896 cmd_line, process_->GetData().id); |
896 | 897 |
897 GpuDataManagerImpl::GetInstance()->AppendGpuCommandLine(cmd_line); | 898 GpuDataManagerImpl::GetInstance()->AppendGpuCommandLine(cmd_line); |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
951 const CreateCommandBufferCallback& callback, int32 route_id) { | 952 const CreateCommandBufferCallback& callback, int32 route_id) { |
952 callback.Run(route_id); | 953 callback.Run(route_id); |
953 } | 954 } |
954 | 955 |
955 void GpuProcessHost::CreateImageError( | 956 void GpuProcessHost::CreateImageError( |
956 const CreateImageCallback& callback, const gfx::Size size) { | 957 const CreateImageCallback& callback, const gfx::Size size) { |
957 callback.Run(size); | 958 callback.Run(size); |
958 } | 959 } |
959 | 960 |
960 } // namespace content | 961 } // namespace content |
OLD | NEW |