| 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_IMAGE_GLX_H_ | 5 #ifndef UI_GL_GL_IMAGE_GLX_H_ |
| 6 #define UI_GL_GL_IMAGE_GLX_H_ | 6 #define UI_GL_GL_IMAGE_GLX_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 10 #include "base/macros.h" |
| 8 #include "ui/gfx/geometry/size.h" | 11 #include "ui/gfx/geometry/size.h" |
| 9 #include "ui/gfx/x/x11_types.h" | 12 #include "ui/gfx/x/x11_types.h" |
| 10 #include "ui/gl/gl_export.h" | 13 #include "ui/gl/gl_export.h" |
| 11 #include "ui/gl/gl_image.h" | 14 #include "ui/gl/gl_image.h" |
| 12 | 15 |
| 13 namespace gl { | 16 namespace gl { |
| 14 | 17 |
| 15 class GL_EXPORT GLImageGLX : public GLImage { | 18 class GL_EXPORT GLImageGLX : public GLImage { |
| 16 public: | 19 public: |
| 17 GLImageGLX(const gfx::Size& size, unsigned internalformat); | 20 GLImageGLX(const gfx::Size& size, unsigned internalformat); |
| (...skipping 26 matching lines...) Expand all Loading... |
| 44 XID glx_pixmap_; | 47 XID glx_pixmap_; |
| 45 const gfx::Size size_; | 48 const gfx::Size size_; |
| 46 unsigned internalformat_; | 49 unsigned internalformat_; |
| 47 | 50 |
| 48 DISALLOW_COPY_AND_ASSIGN(GLImageGLX); | 51 DISALLOW_COPY_AND_ASSIGN(GLImageGLX); |
| 49 }; | 52 }; |
| 50 | 53 |
| 51 } // namespace gl | 54 } // namespace gl |
| 52 | 55 |
| 53 #endif // UI_GL_GL_IMAGE_GLX_H_ | 56 #endif // UI_GL_GL_IMAGE_GLX_H_ |
| OLD | NEW |