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 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1098 switches::kTestGLLib, | 1098 switches::kTestGLLib, |
1099 switches::kTraceStartup, | 1099 switches::kTraceStartup, |
1100 switches::kV, | 1100 switches::kV, |
1101 switches::kVModule, | 1101 switches::kVModule, |
1102 #if defined(OS_MACOSX) | 1102 #if defined(OS_MACOSX) |
1103 switches::kEnableSandboxLogging, | 1103 switches::kEnableSandboxLogging, |
1104 #endif | 1104 #endif |
1105 #if defined(OS_CHROMEOS) | 1105 #if defined(OS_CHROMEOS) |
1106 chromeos::switches::kGpuSandboxFailuresNonfatal, | 1106 chromeos::switches::kGpuSandboxFailuresNonfatal, |
1107 #endif | 1107 #endif |
| 1108 #if defined(USE_AURA) |
| 1109 switches::kUIPrioritizeInGpuProcess, |
| 1110 #endif |
1108 #if defined(USE_OZONE) | 1111 #if defined(USE_OZONE) |
1109 switches::kOzonePlatform, | 1112 switches::kOzonePlatform, |
1110 #endif | 1113 #endif |
1111 #if defined(OS_WIN) | 1114 #if defined(OS_WIN) |
1112 switches::kHighDPISupport, | 1115 switches::kHighDPISupport, |
1113 #endif | 1116 #endif |
1114 }; | 1117 }; |
1115 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1118 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
1116 arraysize(kSwitchNames)); | 1119 arraysize(kSwitchNames)); |
1117 cmd_line->CopySwitchesFrom( | 1120 cmd_line->CopySwitchesFrom( |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1224 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader"); | 1227 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader"); |
1225 ClientIdToShaderCacheMap::iterator iter = | 1228 ClientIdToShaderCacheMap::iterator iter = |
1226 client_id_to_shader_cache_.find(client_id); | 1229 client_id_to_shader_cache_.find(client_id); |
1227 // If the cache doesn't exist then this is an off the record profile. | 1230 // If the cache doesn't exist then this is an off the record profile. |
1228 if (iter == client_id_to_shader_cache_.end()) | 1231 if (iter == client_id_to_shader_cache_.end()) |
1229 return; | 1232 return; |
1230 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader); | 1233 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader); |
1231 } | 1234 } |
1232 | 1235 |
1233 } // namespace content | 1236 } // namespace content |
OLD | NEW |