Chromium Code Reviews| OLD | NEW |
|---|---|
| 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" | 10 #include "base/memory/scoped_generic_obj.h" |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 34 virtual ~GLContextCGL(); | 34 virtual ~GLContextCGL(); |
| 35 | 35 |
| 36 private: | 36 private: |
| 37 GpuPreference GetGpuPreference(); | 37 GpuPreference GetGpuPreference(); |
| 38 | 38 |
| 39 void* context_; | 39 void* context_; |
| 40 GpuPreference gpu_preference_; | 40 GpuPreference gpu_preference_; |
| 41 | 41 |
| 42 CGLPixelFormatObj discrete_pixelformat_; | 42 CGLPixelFormatObj discrete_pixelformat_; |
| 43 | 43 |
| 44 int screen_; | |
| 45 int renderer_; | |
|
Ken Russell (switch to Gerrit)
2013/03/01 22:00:58
renderer -> renderer_id_
| |
| 46 | |
| 44 DISALLOW_COPY_AND_ASSIGN(GLContextCGL); | 47 DISALLOW_COPY_AND_ASSIGN(GLContextCGL); |
| 45 }; | 48 }; |
| 46 | 49 |
| 47 class ScopedCGLDestroyRendererInfo { | 50 class ScopedCGLDestroyRendererInfo { |
| 48 public: | 51 public: |
| 49 void operator()(CGLRendererInfoObj x) const; | 52 void operator()(CGLRendererInfoObj x) const; |
| 50 }; | 53 }; |
| 51 | 54 |
| 52 typedef ScopedGenericObj<CGLRendererInfoObj, ScopedCGLDestroyRendererInfo> | 55 typedef ScopedGenericObj<CGLRendererInfoObj, ScopedCGLDestroyRendererInfo> |
| 53 ScopedCGLRendererInfoObj; | 56 ScopedCGLRendererInfoObj; |
| 54 | 57 |
| 55 } // namespace gfx | 58 } // namespace gfx |
| 56 | 59 |
| 57 #endif // UI_GL_GL_CONTEXT_CGL_H_ | 60 #endif // UI_GL_GL_CONTEXT_CGL_H_ |
| OLD | NEW |