| 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/macros.h" |
| 10 #include "ui/gl/gl_context.h" | 11 #include "ui/gl/gl_context.h" |
| 11 | 12 |
| 12 namespace gfx { | 13 namespace gfx { |
| 13 | 14 |
| 14 class GLSurface; | 15 class GLSurface; |
| 15 | 16 |
| 16 // Encapsulates a CGL OpenGL context. | 17 // Encapsulates a CGL OpenGL context. |
| 17 class GLContextCGL : public GLContextReal { | 18 class GLContextCGL : public GLContextReal { |
| 18 public: | 19 public: |
| 19 explicit GLContextCGL(GLShareGroup* share_group); | 20 explicit GLContextCGL(GLShareGroup* share_group); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 44 int screen_; | 45 int screen_; |
| 45 int renderer_id_; | 46 int renderer_id_; |
| 46 bool safe_to_force_gpu_switch_; | 47 bool safe_to_force_gpu_switch_; |
| 47 | 48 |
| 48 DISALLOW_COPY_AND_ASSIGN(GLContextCGL); | 49 DISALLOW_COPY_AND_ASSIGN(GLContextCGL); |
| 49 }; | 50 }; |
| 50 | 51 |
| 51 } // namespace gfx | 52 } // namespace gfx |
| 52 | 53 |
| 53 #endif // UI_GL_GL_CONTEXT_CGL_H_ | 54 #endif // UI_GL_GL_CONTEXT_CGL_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1545113002:
Switch to standard integer types in ui/gl/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master