Reland: Refactor Vaapi video decoder/encoder in preparation of Freon support

content/common/gpu/media/vaapi_tfp_picture.h

Index: content/common/gpu/media/vaapi_tfp_picture.h
diff --git a/content/common/gpu/media/vaapi_tfp_picture.h b/content/common/gpu/media/vaapi_tfp_picture.h
new file mode 100644
index 0000000000000000000000000000000000000000..a3208da358ee2600868ec03394413e6a7e7756c0
--- /dev/null
+++ b/content/common/gpu/media/vaapi_tfp_picture.h
@@ -0,0 +1,56 @@
+// Copyright 2014 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.
+//
+// This file contains an implementation of picture allocation for the
+// X11 window system used by VaapiVideoDecodeAccelerator to produce
+// output pictures.
+
+#ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_TFP_PICTURE_H_
+#define CONTENT_COMMON_GPU_MEDIA_VAAPI_TFP_PICTURE_H_
+
+#include "base/callback.h"
+#include "base/memory/ref_counted.h"
+#include "content/common/gpu/media/vaapi_picture.h"
+#include "ui/gfx/size.h"
+#include "ui/gl/gl_bindings.h"
+
+namespace gfx {
+class GLImageGLX;
+class GLContextGLX;
+}
+
+namespace content {
+
+class VaapiWrapper;
+
+// Implementation of VaapiPicture for the X11 backed chromium.
+class VaapiTFPPicture : public VaapiPicture {
+ public:
+  VaapiTFPPicture(const scoped_refptr<VaapiWrapper>& vaapi_wrapper,
+                  const base::Callback<bool(void)> make_context_current,
+                  int32 picture_buffer_id,
+                  uint32 texture_id,
+                  const gfx::Size& size);
+
+  ~VaapiTFPPicture() override;
+
+  bool Initialize() override;
+
+  bool DownloadFromSurface(const scoped_refptr<VASurface>& va_surface) override;
+
+ private:
+  scoped_refptr<VaapiWrapper> vaapi_wrapper_;
+
+  base::Callback<bool(void)> make_context_current_;
+  Display* x_display_;
+
+  Pixmap x_pixmap_;
+  scoped_refptr<gfx::GLImageGLX> glx_image_;
+
+  DISALLOW_COPY_AND_ASSIGN(VaapiTFPPicture);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_TFP_PICTURE_H_