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

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

Issue 15848005: Cleanup: Remove ScopedGenericObj. Use scoped_ptr<type, CustomDeleter> instead. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: address mark comments, rebase Created 7 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 | Annotate | Revision Log
« no previous file with comments | « base/memory/scoped_generic_obj.h ('k') | ui/gl/gl_context_cgl.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 #ifndef UI_GL_GL_CONTEXT_CGL_H_ 5 #ifndef UI_GL_GL_CONTEXT_CGL_H_
6 #define UI_GL_GL_CONTEXT_CGL_H_ 6 #define UI_GL_GL_CONTEXT_CGL_H_
7 7
8 #include <OpenGL/CGLTypes.h> 8 #include <OpenGL/CGLTypes.h>
9 9
10 #include "base/memory/scoped_generic_obj.h"
11 #include "ui/gl/gl_context.h" 10 #include "ui/gl/gl_context.h"
12 11
13 namespace gfx { 12 namespace gfx {
14 13
15 class GLSurface; 14 class GLSurface;
16 15
17 // Encapsulates a CGL OpenGL context. 16 // Encapsulates a CGL OpenGL context.
18 class GLContextCGL : public GLContext { 17 class GLContextCGL : public GLContext {
19 public: 18 public:
20 explicit GLContextCGL(GLShareGroup* share_group); 19 explicit GLContextCGL(GLShareGroup* share_group);
(...skipping 21 matching lines...) Expand all
42 41
43 CGLPixelFormatObj discrete_pixelformat_; 42 CGLPixelFormatObj discrete_pixelformat_;
44 43
45 int screen_; 44 int screen_;
46 int renderer_id_; 45 int renderer_id_;
47 bool safe_to_force_gpu_switch_; 46 bool safe_to_force_gpu_switch_;
48 47
49 DISALLOW_COPY_AND_ASSIGN(GLContextCGL); 48 DISALLOW_COPY_AND_ASSIGN(GLContextCGL);
50 }; 49 };
51 50
52 class ScopedCGLDestroyRendererInfo {
53 public:
54 void operator()(CGLRendererInfoObj x) const;
55 };
56
57 typedef ScopedGenericObj<CGLRendererInfoObj, ScopedCGLDestroyRendererInfo>
58 ScopedCGLRendererInfoObj;
59
60 } // namespace gfx 51 } // namespace gfx
61 52
62 #endif // UI_GL_GL_CONTEXT_CGL_H_ 53 #endif // UI_GL_GL_CONTEXT_CGL_H_
OLDNEW
« no previous file with comments | « base/memory/scoped_generic_obj.h ('k') | ui/gl/gl_context_cgl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698