Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Unified Diff: media/gpu/vaapi_picture.h

Issue 1882373004: Migrate content/common/gpu/media code to media/gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix several more bot-identified build issues Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/gpu/vaapi_picture.h
diff --git a/content/common/gpu/media/vaapi_picture.h b/media/gpu/vaapi_picture.h
similarity index 89%
rename from content/common/gpu/media/vaapi_picture.h
rename to media/gpu/vaapi_picture.h
index 4bd51e1162090f788489a43d8a19beb8450b4b66..53b4fa4847de6fdf2888b6da32a3f84872425064 100644
--- a/content/common/gpu/media/vaapi_picture.h
+++ b/media/gpu/vaapi_picture.h
@@ -7,8 +7,8 @@
// (X11/Ozone) and used by VaapiVideoDecodeAccelerator to produce
// output pictures.
-#ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_PICTURE_H_
-#define CONTENT_COMMON_GPU_MEDIA_VAAPI_PICTURE_H_
+#ifndef MEDIA_GPU_VAAPI_PICTURE_H_
+#define MEDIA_GPU_VAAPI_PICTURE_H_
#include <stdint.h>
@@ -16,14 +16,14 @@
#include "base/memory/linked_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/threading/non_thread_safe.h"
-#include "content/common/gpu/media/gpu_video_decode_accelerator_helpers.h"
+#include "media/gpu/gpu_video_decode_accelerator_helpers.h"
#include "ui/gfx/geometry/size.h"
namespace gl {
class GLImage;
}
-namespace content {
+namespace media {
class VASurface;
class VaapiWrapper;
@@ -80,6 +80,6 @@ class VaapiPicture : public base::NonThreadSafe {
DISALLOW_COPY_AND_ASSIGN(VaapiPicture);
};
-} // namespace content
+} // namespace media
-#endif // CONTENT_COMMON_GPU_MEDIA_VAAPI_PICTURE_H_
+#endif // MEDIA_GPU_VAAPI_PICTURE_H_

Powered by Google App Engine
This is Rietveld 408576698