Refactor Vaapi video decoder/encoder in preparation of Freon support

ui/gl/gl_image_glx.h

Index: ui/gl/gl_image_glx.h
diff --git a/ui/gl/gl_image_surface_texture.h b/ui/gl/gl_image_glx.h
similarity index 59%
copy from ui/gl/gl_image_surface_texture.h
copy to ui/gl/gl_image_glx.h
index eaf43633c0d45840c624b9a36db7e2ff898e9aca..57c55c56465218e80517ca583717714ac427976e 100644
--- a/ui/gl/gl_image_surface_texture.h
+++ b/ui/gl/gl_image_glx.h
@@ -1,28 +1,28 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_
-#define UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_
+#ifndef UI_GL_GL_IMAGE_GLX_H_
+#define UI_GL_GL_IMAGE_GLX_H_
 
-#include "base/memory/ref_counted.h"
-#include "ui/gl/gl_bindings.h"
+#include "ui/gfx/size.h"
+#include "ui/gfx/x/x11_types.h"
+#include "ui/gl/gl_export.h"
 #include "ui/gl/gl_image.h"
 
 namespace gfx {
-class SurfaceTexture;
 
-class GL_EXPORT GLImageSurfaceTexture : public GLImage {
+class GL_EXPORT GLImageGLX : public GLImage {
  public:
-  explicit GLImageSurfaceTexture(const gfx::Size& size);
+  GLImageGLX(const gfx::Size& size, unsigned internalformat);
 
-  bool Initialize(SurfaceTexture* surface_texture);
+  bool Initialize(XID pixmap);
 
   // Overridden from GLImage:
   virtual void Destroy(bool have_context) override;
   virtual gfx::Size GetSize() override;
   virtual bool BindTexImage(unsigned target) override;
-  virtual void ReleaseTexImage(unsigned target) override {}
+  virtual void ReleaseTexImage(unsigned target) override;
   virtual bool CopyTexImage(unsigned target) override;
   virtual void WillUseTexImage() override {}
   virtual void DidUseTexImage() override {}
@@ -35,16 +35,16 @@ class GL_EXPORT GLImageSurfaceTexture : public GLImage {
                                     const RectF& crop_rect) override;
 
  protected:
-  virtual ~GLImageSurfaceTexture();
+  virtual ~GLImageGLX();
 
  private:
-  scoped_refptr<SurfaceTexture> surface_texture_;
+  XID glx_pixmap_;
   const gfx::Size size_;
-  GLint texture_id_;
+  unsigned internalformat_;
 
-  DISALLOW_COPY_AND_ASSIGN(GLImageSurfaceTexture);
+  DISALLOW_COPY_AND_ASSIGN(GLImageGLX);
 };
 
 }  // namespace gfx
 
-#endif  // UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_
+#endif  // UI_GL_GL_IMAGE_GLX_H_