| 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 "ui/gfx/size.h" | 8 #include "ui/gfx/size.h" |
| 9 #include "ui/gfx/x/x11_types.h" | 9 #include "ui/gfx/x/x11_types.h" |
| 10 #include "ui/gl/gl_export.h" | 10 #include "ui/gl/gl_export.h" |
| 11 #include "ui/gl/gl_image.h" | 11 #include "ui/gl/gl_image.h" |
| 12 | 12 |
| 13 namespace gfx { | 13 namespace gfx { |
| 14 | 14 |
| 15 class GL_EXPORT GLImageGLX : public GLImage { | 15 class GL_EXPORT GLImageGLX : public GLImage { |
| 16 public: | 16 public: |
| 17 explicit GLImageGLX(gfx::PluginWindowHandle window); | 17 GLImageGLX(const gfx::Size& size, unsigned internalformat); |
| 18 | 18 |
| 19 virtual bool Initialize(); | 19 bool Initialize(XID pixmap); |
| 20 | 20 |
| 21 // Overridden from GLImage: | 21 // Overridden from GLImage: |
| 22 virtual void Destroy() OVERRIDE; | 22 virtual void Destroy() OVERRIDE; |
| 23 virtual gfx::Size GetSize() OVERRIDE; | 23 virtual gfx::Size GetSize() OVERRIDE; |
| 24 virtual bool BindTexImage(unsigned target) OVERRIDE; | 24 virtual bool BindTexImage(unsigned target) OVERRIDE; |
| 25 virtual void ReleaseTexImage(unsigned target) OVERRIDE; | 25 virtual void ReleaseTexImage(unsigned target) OVERRIDE; |
| 26 virtual void WillUseTexImage() OVERRIDE {} | 26 virtual void WillUseTexImage() OVERRIDE {} |
| 27 virtual void DidUseTexImage() OVERRIDE {} | 27 virtual void DidUseTexImage() OVERRIDE {} |
| 28 virtual void WillModifyTexImage() OVERRIDE {} | 28 virtual void WillModifyTexImage() OVERRIDE {} |
| 29 virtual void DidModifyTexImage() OVERRIDE {} | 29 virtual void DidModifyTexImage() OVERRIDE {} |
| 30 | 30 |
| 31 protected: | 31 protected: |
| 32 virtual ~GLImageGLX(); | 32 virtual ~GLImageGLX(); |
| 33 | 33 |
| 34 private: | 34 private: |
| 35 XDisplay* display_; | |
| 36 gfx::PluginWindowHandle window_; | |
| 37 XID pixmap_; | |
| 38 XID glx_pixmap_; | 35 XID glx_pixmap_; |
| 39 gfx::Size size_; | 36 const gfx::Size size_; |
| 37 unsigned internalformat_; |
| 40 | 38 |
| 41 DISALLOW_COPY_AND_ASSIGN(GLImageGLX); | 39 DISALLOW_COPY_AND_ASSIGN(GLImageGLX); |
| 42 }; | 40 }; |
| 43 | 41 |
| 44 } // namespace gfx | 42 } // namespace gfx |
| 45 | 43 |
| 46 #endif // UI_GL_GL_IMAGE_GLX_H_ | 44 #endif // UI_GL_GL_IMAGE_GLX_H_ |
| OLD | NEW |