| 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_GFX_GL_GL_SURFACE_CGL_H_ | 5 #ifndef UI_GL_GL_SURFACE_CGL_H_ |
| 6 #define UI_GFX_GL_GL_SURFACE_CGL_H_ | 6 #define UI_GL_GL_SURFACE_CGL_H_ |
| 7 #pragma once |
| 7 | 8 |
| 8 #include "ui/gfx/gl/gl_surface.h" | |
| 9 #include "ui/gfx/size.h" | 9 #include "ui/gfx/size.h" |
| 10 #include "ui/gl/gl_surface.h" |
| 10 | 11 |
| 11 namespace gfx { | 12 namespace gfx { |
| 12 | 13 |
| 13 // Base class for CGL surfaces. | 14 // Base class for CGL surfaces. |
| 14 class GLSurfaceCGL : public GLSurface { | 15 class GLSurfaceCGL : public GLSurface { |
| 15 public: | 16 public: |
| 16 GLSurfaceCGL(); | 17 GLSurfaceCGL(); |
| 17 | 18 |
| 18 static bool InitializeOneOff(); | 19 static bool InitializeOneOff(); |
| 19 static void* GetPixelFormat(); | 20 static void* GetPixelFormat(); |
| (...skipping 25 matching lines...) Expand all Loading... |
| 45 virtual ~NoOpGLSurfaceCGL(); | 46 virtual ~NoOpGLSurfaceCGL(); |
| 46 | 47 |
| 47 private: | 48 private: |
| 48 gfx::Size size_; | 49 gfx::Size size_; |
| 49 | 50 |
| 50 DISALLOW_COPY_AND_ASSIGN(NoOpGLSurfaceCGL); | 51 DISALLOW_COPY_AND_ASSIGN(NoOpGLSurfaceCGL); |
| 51 }; | 52 }; |
| 52 | 53 |
| 53 } // namespace gfx | 54 } // namespace gfx |
| 54 | 55 |
| 55 #endif // UI_GFX_GL_GL_SURFACE_CGL_H_ | 56 #endif // UI_GL_GL_SURFACE_CGL_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10392068:
ui: Move gl/ directory out of gfx/, up to ui/. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src