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

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

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 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 | Annotate | Revision Log
« no previous file with comments | « ui/gl/gl_context_cgl.h ('k') | ui/gl/gl_context_egl.h » ('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/gfx/gl/gl_context_cgl.h" 5 #include "ui/gl/gl_context_cgl.h"
6 6
7 #include <OpenGL/CGLRenderers.h> 7 #include <OpenGL/CGLRenderers.h>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "ui/gfx/gl/gl_bindings.h" 12 #include "ui/gl/gl_bindings.h"
13 #include "ui/gfx/gl/gl_implementation.h" 13 #include "ui/gl/gl_implementation.h"
14 #include "ui/gfx/gl/gl_surface_cgl.h" 14 #include "ui/gl/gl_surface_cgl.h"
15 15
16 namespace gfx { 16 namespace gfx {
17 17
18 GLContextCGL::GLContextCGL(GLShareGroup* share_group) 18 GLContextCGL::GLContextCGL(GLShareGroup* share_group)
19 : GLContext(share_group), 19 : GLContext(share_group),
20 context_(NULL), 20 context_(NULL),
21 gpu_preference_(PreferIntegratedGpu) { 21 gpu_preference_(PreferIntegratedGpu) {
22 } 22 }
23 23
24 bool GLContextCGL::Initialize(GLSurface* compatible_surface, 24 bool GLContextCGL::Initialize(GLSurface* compatible_surface,
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 if (format) 154 if (format)
155 return; 155 return;
156 CGLPixelFormatAttribute attribs[1]; 156 CGLPixelFormatAttribute attribs[1];
157 attribs[0] = static_cast<CGLPixelFormatAttribute>(0); 157 attribs[0] = static_cast<CGLPixelFormatAttribute>(0);
158 GLint num_pixel_formats = 0; 158 GLint num_pixel_formats = 0;
159 CGLChoosePixelFormat(attribs, &format, &num_pixel_formats); 159 CGLChoosePixelFormat(attribs, &format, &num_pixel_formats);
160 // format is deliberately leaked. 160 // format is deliberately leaked.
161 } 161 }
162 162
163 } // namespace gfx 163 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_context_cgl.h ('k') | ui/gl/gl_context_egl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698