| Index: media/gpu/vaapi_drm_picture.h
|
| diff --git a/content/common/gpu/media/vaapi_drm_picture.h b/media/gpu/vaapi_drm_picture.h
|
| similarity index 86%
|
| rename from content/common/gpu/media/vaapi_drm_picture.h
|
| rename to media/gpu/vaapi_drm_picture.h
|
| index 7f5fc8a1780e7023ffd80e70b1b6dd5ae0517c37..b23811f429ec9d38e3ea1b1dad2707792bbe7e5b 100644
|
| --- a/content/common/gpu/media/vaapi_drm_picture.h
|
| +++ b/media/gpu/vaapi_drm_picture.h
|
| @@ -6,15 +6,15 @@
|
| // Ozone window system used by VaapiVideoDecodeAccelerator to produce
|
| // output pictures.
|
|
|
| -#ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_DRM_PICTURE_H_
|
| -#define CONTENT_COMMON_GPU_MEDIA_VAAPI_DRM_PICTURE_H_
|
| +#ifndef MEDIA_GPU_VAAPI_DRM_PICTURE_H_
|
| +#define MEDIA_GPU_VAAPI_DRM_PICTURE_H_
|
|
|
| #include <stdint.h>
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "content/common/gpu/media/vaapi_picture.h"
|
| +#include "media/gpu/vaapi_picture.h"
|
| #include "ui/gfx/buffer_types.h"
|
| #include "ui/gfx/geometry/size.h"
|
|
|
| @@ -26,7 +26,7 @@ namespace ui {
|
| class NativePixmap;
|
| }
|
|
|
| -namespace content {
|
| +namespace media {
|
|
|
| class VaapiWrapper;
|
|
|
| @@ -65,6 +65,6 @@ class VaapiDrmPicture : public VaapiPicture {
|
| DISALLOW_COPY_AND_ASSIGN(VaapiDrmPicture);
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace media
|
|
|
| -#endif // CONTENT_COMMON_GPU_MEDIA_VAAPI_DRM_PICTURE_H_
|
| +#endif // MEDIA_GPU_VAAPI_DRM_PICTURE_H_
|
|
|