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

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

Issue 1984323005: Pass switches::kX11VisualID and use it from gl_surface_egl.cc::GetPlatformANGLEDisplay (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Just rebase Created 4 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
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 switches::kDisableRemoteCoreAnimation, 132 switches::kDisableRemoteCoreAnimation,
133 switches::kEnableSandboxLogging, 133 switches::kEnableSandboxLogging,
134 switches::kShowMacOverlayBorders, 134 switches::kShowMacOverlayBorders,
135 #endif 135 #endif
136 #if defined(USE_OZONE) 136 #if defined(USE_OZONE)
137 switches::kOzonePlatform, 137 switches::kOzonePlatform,
138 #endif 138 #endif
139 #if defined(USE_X11) && !defined(OS_CHROMEOS) 139 #if defined(USE_X11) && !defined(OS_CHROMEOS)
140 switches::kWindowDepth, 140 switches::kWindowDepth,
141 switches::kX11Display, 141 switches::kX11Display,
142 switches::kX11VisualID,
142 #endif 143 #endif
143 switches::kGpuTestingGLVendor, 144 switches::kGpuTestingGLVendor,
144 switches::kGpuTestingGLRenderer, 145 switches::kGpuTestingGLRenderer,
145 switches::kGpuTestingGLVersion, 146 switches::kGpuTestingGLVersion,
146 }; 147 };
147 148
148 enum GPUProcessLifetimeEvent { 149 enum GPUProcessLifetimeEvent {
149 LAUNCHED, 150 LAUNCHED,
150 DIED_FIRST_TIME, 151 DIED_FIRST_TIME,
151 DIED_SECOND_TIME, 152 DIED_SECOND_TIME,
(...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after
1171 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader"); 1172 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
1172 ClientIdToShaderCacheMap::iterator iter = 1173 ClientIdToShaderCacheMap::iterator iter =
1173 client_id_to_shader_cache_.find(client_id); 1174 client_id_to_shader_cache_.find(client_id);
1174 // If the cache doesn't exist then this is an off the record profile. 1175 // If the cache doesn't exist then this is an off the record profile.
1175 if (iter == client_id_to_shader_cache_.end()) 1176 if (iter == client_id_to_shader_cache_.end())
1176 return; 1177 return;
1177 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader); 1178 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader);
1178 } 1179 }
1179 1180
1180 } // namespace content 1181 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698