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

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

Issue 1147553003: ozone: Add atomic initialization path (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 #if defined(OS_MACOSX) 105 #if defined(OS_MACOSX)
106 switches::kDisableRemoteCoreAnimation, 106 switches::kDisableRemoteCoreAnimation,
107 switches::kEnableSandboxLogging, 107 switches::kEnableSandboxLogging,
108 #endif 108 #endif
109 #if defined(USE_AURA) 109 #if defined(USE_AURA)
110 switches::kUIPrioritizeInGpuProcess, 110 switches::kUIPrioritizeInGpuProcess,
111 #endif 111 #endif
112 #if defined(USE_OZONE) 112 #if defined(USE_OZONE)
113 switches::kOzonePlatform, 113 switches::kOzonePlatform,
114 switches::kOzoneUseSurfaceless, 114 switches::kOzoneUseSurfaceless,
115 switches::kOzoneUseAtomicDrm,
115 #endif 116 #endif
116 #if defined(USE_X11) && !defined(OS_CHROMEOS) 117 #if defined(USE_X11) && !defined(OS_CHROMEOS)
117 switches::kX11Display, 118 switches::kX11Display,
118 #endif 119 #endif
119 }; 120 };
120 121
121 enum GPUProcessLifetimeEvent { 122 enum GPUProcessLifetimeEvent {
122 LAUNCHED, 123 LAUNCHED,
123 DIED_FIRST_TIME, 124 DIED_FIRST_TIME,
124 DIED_SECOND_TIME, 125 DIED_SECOND_TIME,
(...skipping 965 matching lines...) Expand 10 before | Expand all | Expand 10 after
1090 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader"); 1091 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
1091 ClientIdToShaderCacheMap::iterator iter = 1092 ClientIdToShaderCacheMap::iterator iter =
1092 client_id_to_shader_cache_.find(client_id); 1093 client_id_to_shader_cache_.find(client_id);
1093 // If the cache doesn't exist then this is an off the record profile. 1094 // If the cache doesn't exist then this is an off the record profile.
1094 if (iter == client_id_to_shader_cache_.end()) 1095 if (iter == client_id_to_shader_cache_.end())
1095 return; 1096 return;
1096 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader); 1097 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader);
1097 } 1098 }
1098 1099
1099 } // namespace content 1100 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698