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 1075 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1086 switches::kDisableGpuWatchdog, | 1086 switches::kDisableGpuWatchdog, |
1087 switches::kDisableLogging, | 1087 switches::kDisableLogging, |
1088 switches::kDisableSeccompFilterSandbox, | 1088 switches::kDisableSeccompFilterSandbox, |
1089 #if defined(ENABLE_WEBRTC) | 1089 #if defined(ENABLE_WEBRTC) |
1090 switches::kDisableWebRtcHWEncoding, | 1090 switches::kDisableWebRtcHWEncoding, |
1091 #endif | 1091 #endif |
1092 switches::kEnableLogging, | 1092 switches::kEnableLogging, |
1093 switches::kEnableShareGroupAsyncTextureUpload, | 1093 switches::kEnableShareGroupAsyncTextureUpload, |
1094 switches::kGpuStartupDialog, | 1094 switches::kGpuStartupDialog, |
1095 switches::kGpuSandboxAllowSysVShm, | 1095 switches::kGpuSandboxAllowSysVShm, |
1096 switches::kGpuSandboxStartLater, | |
piman
2014/03/19 01:16:55
Can you add this to chrome/browser/chromeos/login/
davidung
2014/03/19 01:21:56
yes, the new rebased patch adds this.
but in the l
| |
1096 switches::kLoggingLevel, | 1097 switches::kLoggingLevel, |
1097 switches::kNoSandbox, | 1098 switches::kNoSandbox, |
1098 switches::kTestGLLib, | 1099 switches::kTestGLLib, |
1099 switches::kTraceStartup, | 1100 switches::kTraceStartup, |
1100 switches::kV, | 1101 switches::kV, |
1101 switches::kVModule, | 1102 switches::kVModule, |
1102 #if defined(OS_MACOSX) | 1103 #if defined(OS_MACOSX) |
1103 switches::kEnableSandboxLogging, | 1104 switches::kEnableSandboxLogging, |
1104 #endif | 1105 #endif |
1105 #if defined(OS_CHROMEOS) | 1106 #if defined(OS_CHROMEOS) |
(...skipping 121 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 |