| Index: ui/gl/gl_image_glx.h
|
| diff --git a/ui/gl/gl_image_glx.h b/ui/gl/gl_image_glx.h
|
| index d94520200d882e9c8345310c92c72375589910f1..f8027e12b697dae68e8f94bad5f4ebd55e92790a 100644
|
| --- a/ui/gl/gl_image_glx.h
|
| +++ b/ui/gl/gl_image_glx.h
|
| @@ -14,9 +14,9 @@ namespace gfx {
|
|
|
| class GL_EXPORT GLImageGLX : public GLImage {
|
| public:
|
| - explicit GLImageGLX(gfx::PluginWindowHandle window);
|
| + GLImageGLX(const gfx::Size& size, unsigned internalformat);
|
|
|
| - virtual bool Initialize();
|
| + bool Initialize(XID pixmap);
|
|
|
| // Overridden from GLImage:
|
| virtual void Destroy() OVERRIDE;
|
| @@ -32,11 +32,9 @@ class GL_EXPORT GLImageGLX : public GLImage {
|
| virtual ~GLImageGLX();
|
|
|
| private:
|
| - XDisplay* display_;
|
| - gfx::PluginWindowHandle window_;
|
| - XID pixmap_;
|
| XID glx_pixmap_;
|
| - gfx::Size size_;
|
| + const gfx::Size size_;
|
| + unsigned internalformat_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GLImageGLX);
|
| };
|
|
|