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

Side by Side Diff: content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc

Issue 803813003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 12 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/common/appcache_interfaces.h ('k') | content/common/gpu/gpu_channel_manager.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/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" 5 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
6 6
7 #include "third_party/khronos/GLES2/gl2.h" 7 #include "third_party/khronos/GLES2/gl2.h"
8 #ifndef GL_GLEXT_PROTOTYPES 8 #ifndef GL_GLEXT_PROTOTYPES
9 #define GL_GLEXT_PROTOTYPES 1 9 #define GL_GLEXT_PROTOTYPES 1
10 #endif 10 #endif
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 mem_limits_.min_transfer_buffer_size, 271 mem_limits_.min_transfer_buffer_size,
272 mem_limits_.max_transfer_buffer_size, 272 mem_limits_.max_transfer_buffer_size,
273 mem_limits_.mapped_memory_reclaim_limit)) { 273 mem_limits_.mapped_memory_reclaim_limit)) {
274 LOG(ERROR) << "Failed to initialize GLES2Implementation."; 274 LOG(ERROR) << "Failed to initialize GLES2Implementation.";
275 return false; 275 return false;
276 } 276 }
277 277
278 if (add_to_share_group) 278 if (add_to_share_group)
279 share_group_->AddContextLocked(this); 279 share_group_->AddContextLocked(this);
280 280
281 if (CommandLine::ForCurrentProcess()->HasSwitch( 281 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
282 switches::kEnableGpuClientTracing)) { 282 switches::kEnableGpuClientTracing)) {
283 trace_gl_.reset(new gpu::gles2::GLES2TraceImplementation(GetGLInterface())); 283 trace_gl_.reset(new gpu::gles2::GLES2TraceImplementation(GetGLInterface()));
284 setGLInterface(trace_gl_.get()); 284 setGLInterface(trace_gl_.get());
285 } 285 }
286 return true; 286 return true;
287 } 287 }
288 288
289 bool WebGraphicsContext3DCommandBufferImpl::InitializeOnCurrentThread() { 289 bool WebGraphicsContext3DCommandBufferImpl::InitializeOnCurrentThread() {
290 if (!MaybeInitializeGL()) { 290 if (!MaybeInitializeGL()) {
291 DLOG(ERROR) << "Failed to initialize context."; 291 DLOG(ERROR) << "Failed to initialize context.";
292 return false; 292 return false;
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 share_group_->RemoveAllContexts(); 411 share_group_->RemoveAllContexts();
412 412
413 DCHECK(host_.get()); 413 DCHECK(host_.get());
414 { 414 {
415 base::AutoLock lock(g_default_share_groups_lock.Get()); 415 base::AutoLock lock(g_default_share_groups_lock.Get());
416 g_default_share_groups.Get().erase(host_.get()); 416 g_default_share_groups.Get().erase(host_.get());
417 } 417 }
418 } 418 }
419 419
420 } // namespace content 420 } // namespace content
OLDNEW
« no previous file with comments | « content/common/appcache_interfaces.h ('k') | content/common/gpu/gpu_channel_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698