| 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
|
| index 3261791fbf0723131c6610d9fa68ce5c4bcbc10b..fdc2c64b723a355122d42b8da37c051b35471fe8 100644
|
| --- a/content/common/gpu/media/vaapi_tfp_picture.h
|
| +++ b/content/common/gpu/media/vaapi_tfp_picture.h
|
| @@ -16,10 +16,13 @@
|
| #include "ui/gl/gl_bindings.h"
|
|
|
| namespace gfx {
|
| -class GLImageGLX;
|
| class GLContextGLX;
|
| }
|
|
|
| +namespace gl {
|
| +class GLImageGLX;
|
| +}
|
| +
|
| namespace content {
|
|
|
| class VaapiWrapper;
|
| @@ -39,7 +42,7 @@ class VaapiTFPPicture : public VaapiPicture {
|
|
|
| bool DownloadFromSurface(const scoped_refptr<VASurface>& va_surface) override;
|
|
|
| - scoped_refptr<gfx::GLImage> GetImageToBind() override;
|
| + scoped_refptr<gl::GLImage> GetImageToBind() override;
|
|
|
| private:
|
| VaapiWrapper* vaapi_wrapper_; // Not owned.
|
| @@ -48,7 +51,7 @@ class VaapiTFPPicture : public VaapiPicture {
|
| Display* x_display_;
|
|
|
| Pixmap x_pixmap_;
|
| - scoped_refptr<gfx::GLImageGLX> glx_image_;
|
| + scoped_refptr<gl::GLImageGLX> glx_image_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(VaapiTFPPicture);
|
| };
|
|
|