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

Side by Side Diff: ui/gl/gl_context.cc

Issue 2347383002: X11: Use better visuals for OpenGL (Closed)
Patch Set: Fix various tests Created 4 years, 2 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 "ui/gl/gl_context.h" 5 #include "ui/gl/gl_context.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/cancelable_callback.h" 10 #include "base/cancelable_callback.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 void GLContext::ScopedReleaseCurrent::Cancel() { 43 void GLContext::ScopedReleaseCurrent::Cancel() {
44 canceled_ = true; 44 canceled_ = true;
45 } 45 }
46 46
47 GLContext::GLContext(GLShareGroup* share_group) 47 GLContext::GLContext(GLShareGroup* share_group)
48 : share_group_(share_group), 48 : share_group_(share_group),
49 current_virtual_context_(nullptr), 49 current_virtual_context_(nullptr),
50 state_dirtied_externally_(false), 50 state_dirtied_externally_(false),
51 swap_interval_(1), 51 swap_interval_(1),
52 force_swap_interval_zero_(false) { 52 force_swap_interval_zero_(false),
53 weak_factory_(this) {
53 if (!share_group_.get()) 54 if (!share_group_.get())
54 share_group_ = new GLShareGroup; 55 share_group_ = gl::CreateGLShareGroup();
55 56
56 share_group_->AddContext(this); 57 share_group_->AddContext(this);
57 } 58 }
58 59
59 GLContext::~GLContext() { 60 GLContext::~GLContext() {
60 share_group_->RemoveContext(this); 61 share_group_->RemoveContext(this);
61 if (GetCurrent() == this) { 62 if (GetCurrent() == this) {
62 SetCurrent(nullptr); 63 SetCurrent(nullptr);
63 } 64 }
64 } 65 }
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 274
274 scoped_refptr<GLContext> InitializeGLContext(scoped_refptr<GLContext> context, 275 scoped_refptr<GLContext> InitializeGLContext(scoped_refptr<GLContext> context,
275 GLSurface* compatible_surface, 276 GLSurface* compatible_surface,
276 GpuPreference gpu_preference) { 277 GpuPreference gpu_preference) {
277 if (!context->Initialize(compatible_surface, gpu_preference)) 278 if (!context->Initialize(compatible_surface, gpu_preference))
278 return nullptr; 279 return nullptr;
279 return context; 280 return context;
280 } 281 }
281 282
282 } // namespace gl 283 } // namespace gl
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698