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

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

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 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 | « ui/gl/gl_context_glx.h ('k') | ui/gl/gl_context_mac.mm » ('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 "ui/gl/gl_context_glx.h" 5 #include "ui/gl/gl_context_glx.h"
6 6
7 extern "C" { 7 extern "C" {
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 } 9 }
10 #include <memory> 10 #include <memory>
11 11
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/numerics/safe_conversions.h" 13 #include "base/numerics/safe_conversions.h"
14 #include "base/trace_event/trace_event.h" 14 #include "base/trace_event/trace_event.h"
15 #include "ui/gl/GL/glextchromium.h" 15 #include "ui/gl/GL/glextchromium.h"
16 #include "ui/gl/gl_bindings.h" 16 #include "ui/gl/gl_bindings.h"
17 #include "ui/gl/gl_implementation.h" 17 #include "ui/gl/gl_implementation.h"
18 #include "ui/gl/gl_surface_glx.h" 18 #include "ui/gl/gl_surface_glx.h"
19 19
20 namespace gfx { 20 namespace gl {
21 21
22 GLContextGLX::GLContextGLX(GLShareGroup* share_group) 22 GLContextGLX::GLContextGLX(GLShareGroup* share_group)
23 : GLContextReal(share_group), 23 : GLContextReal(share_group),
24 context_(nullptr), 24 context_(nullptr),
25 display_(nullptr) { 25 display_(nullptr) {
26 } 26 }
27 27
28 XDisplay* GLContextGLX::display() { 28 XDisplay* GLContextGLX::display() {
29 return display_; 29 return display_;
30 } 30 }
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 } 194 }
195 195
196 bool GLContextGLX::WasAllocatedUsingRobustnessExtension() { 196 bool GLContextGLX::WasAllocatedUsingRobustnessExtension() {
197 return GLSurfaceGLX::IsCreateContextRobustnessSupported(); 197 return GLSurfaceGLX::IsCreateContextRobustnessSupported();
198 } 198 }
199 199
200 GLContextGLX::~GLContextGLX() { 200 GLContextGLX::~GLContextGLX() {
201 Destroy(); 201 Destroy();
202 } 202 }
203 203
204 } // namespace gfx 204 } // namespace gl
OLDNEW
« no previous file with comments | « ui/gl/gl_context_glx.h ('k') | ui/gl/gl_context_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698