Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

Side by Side Diff: content/browser/gpu/gpu_process_host.cc

Issue 137403005: Remove some code inside USE_AURA and OS_WIN ifdefs. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1144 #endif 1144 #endif
1145 #if defined(OS_CHROMEOS) 1145 #if defined(OS_CHROMEOS)
1146 chromeos::switches::kGpuSandboxFailuresNonfatal, 1146 chromeos::switches::kGpuSandboxFailuresNonfatal,
1147 #endif 1147 #endif
1148 #if defined(USE_AURA) 1148 #if defined(USE_AURA)
1149 switches::kUIPrioritizeInGpuProcess, 1149 switches::kUIPrioritizeInGpuProcess,
1150 #endif 1150 #endif
1151 #if defined(USE_OZONE) 1151 #if defined(USE_OZONE)
1152 switches::kOzonePlatform, 1152 switches::kOzonePlatform,
1153 #endif 1153 #endif
1154 #if defined(OS_WIN) && defined(USE_AURA) 1154 #if defined(OS_WIN)
1155 switches::kHighDPISupport, 1155 switches::kHighDPISupport,
1156 #endif 1156 #endif
1157 }; 1157 };
1158 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1158 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1159 arraysize(kSwitchNames)); 1159 arraysize(kSwitchNames));
1160 cmd_line->CopySwitchesFrom( 1160 cmd_line->CopySwitchesFrom(
1161 browser_command_line, switches::kGpuSwitches, switches::kNumGpuSwitches); 1161 browser_command_line, switches::kGpuSwitches, switches::kNumGpuSwitches);
1162 cmd_line->CopySwitchesFrom( 1162 cmd_line->CopySwitchesFrom(
1163 browser_command_line, switches::kGLSwitchesCopiedFromGpuProcessHost, 1163 browser_command_line, switches::kGLSwitchesCopiedFromGpuProcessHost,
1164 switches::kGLSwitchesCopiedFromGpuProcessHostNumSwitches); 1164 switches::kGLSwitchesCopiedFromGpuProcessHostNumSwitches);
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1266 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader"); 1266 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
1267 ClientIdToShaderCacheMap::iterator iter = 1267 ClientIdToShaderCacheMap::iterator iter =
1268 client_id_to_shader_cache_.find(client_id); 1268 client_id_to_shader_cache_.find(client_id);
1269 // If the cache doesn't exist then this is an off the record profile. 1269 // If the cache doesn't exist then this is an off the record profile.
1270 if (iter == client_id_to_shader_cache_.end()) 1270 if (iter == client_id_to_shader_cache_.end())
1271 return; 1271 return;
1272 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader); 1272 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader);
1273 } 1273 }
1274 1274
1275 } // namespace content 1275 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698