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/base64.h" | 7 #include "base/base64.h" |
8 #include "base/base_switches.h" | 8 #include "base/base_switches.h" |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 1126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1137 UMA_HISTOGRAM_BOOLEAN("GPU.GPU.GPUProcessSoftwareRendering", | 1137 UMA_HISTOGRAM_BOOLEAN("GPU.GPU.GPUProcessSoftwareRendering", |
1138 swiftshader_rendering_); | 1138 swiftshader_rendering_); |
1139 | 1139 |
1140 // If specified, prepend a launcher program to the command line. | 1140 // If specified, prepend a launcher program to the command line. |
1141 if (!gpu_launcher.empty()) | 1141 if (!gpu_launcher.empty()) |
1142 cmd_line->PrependWrapper(gpu_launcher); | 1142 cmd_line->PrependWrapper(gpu_launcher); |
1143 | 1143 |
1144 process_->Launch( | 1144 process_->Launch( |
1145 #if defined(OS_WIN) | 1145 #if defined(OS_WIN) |
1146 new GpuSandboxedProcessLauncherDelegate(cmd_line), | 1146 new GpuSandboxedProcessLauncherDelegate(cmd_line), |
| 1147 false, |
1147 #elif defined(OS_POSIX) | 1148 #elif defined(OS_POSIX) |
1148 false, | 1149 false, |
1149 base::EnvironmentMap(), | 1150 base::EnvironmentMap(), |
1150 #endif | 1151 #endif |
1151 cmd_line); | 1152 cmd_line); |
1152 process_launched_ = true; | 1153 process_launched_ = true; |
1153 | 1154 |
1154 UMA_HISTOGRAM_ENUMERATION("GPU.GPUProcessLifetimeEvents", | 1155 UMA_HISTOGRAM_ENUMERATION("GPU.GPUProcessLifetimeEvents", |
1155 LAUNCHED, GPU_PROCESS_LIFETIME_EVENT_MAX); | 1156 LAUNCHED, GPU_PROCESS_LIFETIME_EVENT_MAX); |
1156 return true; | 1157 return true; |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1227 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader"); | 1228 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader"); |
1228 ClientIdToShaderCacheMap::iterator iter = | 1229 ClientIdToShaderCacheMap::iterator iter = |
1229 client_id_to_shader_cache_.find(client_id); | 1230 client_id_to_shader_cache_.find(client_id); |
1230 // If the cache doesn't exist then this is an off the record profile. | 1231 // If the cache doesn't exist then this is an off the record profile. |
1231 if (iter == client_id_to_shader_cache_.end()) | 1232 if (iter == client_id_to_shader_cache_.end()) |
1232 return; | 1233 return; |
1233 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader); | 1234 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader); |
1234 } | 1235 } |
1235 | 1236 |
1236 } // namespace content | 1237 } // namespace content |
OLD | NEW |