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

Unified Diff: media/gpu/android_copying_backing_strategy.h

Issue 1939683002: Test X11 header pollution (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « media/gpu/accelerated_video_decoder.h ('k') | media/gpu/android_copying_backing_strategy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/android_copying_backing_strategy.h
diff --git a/content/common/gpu/media/android_copying_backing_strategy.h b/media/gpu/android_copying_backing_strategy.h
similarity index 82%
rename from content/common/gpu/media/android_copying_backing_strategy.h
rename to media/gpu/android_copying_backing_strategy.h
index 8c004d5edba433e3079107c3f72a4012e3af5b65..d1a3f098e13c41056dfdca67d3a360b539148f92 100644
--- a/content/common/gpu/media/android_copying_backing_strategy.h
+++ b/media/gpu/android_copying_backing_strategy.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_COMMON_GPU_MEDIA_ANDROID_COPYING_BACKING_STRATEGY_H_
-#define CONTENT_COMMON_GPU_MEDIA_ANDROID_COPYING_BACKING_STRATEGY_H_
+#ifndef MEDIA_GPU_ANDROID_COPYING_BACKING_STRATEGY_H_
+#define MEDIA_GPU_ANDROID_COPYING_BACKING_STRATEGY_H_
#include <stdint.h>
#include <memory>
#include "base/compiler_specific.h"
-#include "content/common/content_export.h"
-#include "content/common/gpu/media/android_video_decode_accelerator.h"
+#include "media/gpu/android_video_decode_accelerator.h"
+#include "media/gpu/media_gpu_export.h"
namespace gpu {
class CopyTextureCHROMIUMResourceManager;
@@ -21,13 +21,13 @@ namespace media {
class PictureBuffer;
}
-namespace content {
+namespace media {
class AVDAStateProvider;
// A BackingStrategy implementation that copies images to PictureBuffer
// textures via gpu texture copy.
-class CONTENT_EXPORT AndroidCopyingBackingStrategy
+class MEDIA_GPU_EXPORT AndroidCopyingBackingStrategy
: public AndroidVideoDecodeAccelerator::BackingStrategy {
public:
explicit AndroidCopyingBackingStrategy(AVDAStateProvider* state_provider);
@@ -65,6 +65,6 @@ class CONTENT_EXPORT AndroidCopyingBackingStrategy
media::VideoCodecBridge* media_codec_;
};
-} // namespace content
+} // namespace media
-#endif // CONTENT_COMMON_GPU_MEDIA_ANDROID_COPYING_BACKING_STRATEGY_H_
+#endif // MEDIA_GPU_ANDROID_COPYING_BACKING_STRATEGY_H_
« no previous file with comments | « media/gpu/accelerated_video_decoder.h ('k') | media/gpu/android_copying_backing_strategy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698