| Index: media/gpu/android_deferred_rendering_backing_strategy.h
|
| diff --git a/content/common/gpu/media/android_deferred_rendering_backing_strategy.h b/media/gpu/android_deferred_rendering_backing_strategy.h
|
| similarity index 88%
|
| rename from content/common/gpu/media/android_deferred_rendering_backing_strategy.h
|
| rename to media/gpu/android_deferred_rendering_backing_strategy.h
|
| index 733b25b0a45a7685449bdb4cb00e2b4b3a45267e..0cd1d3ef1bd1b1c2dade1ad4e36fbca93615b34f 100644
|
| --- a/content/common/gpu/media/android_deferred_rendering_backing_strategy.h
|
| +++ b/media/gpu/android_deferred_rendering_backing_strategy.h
|
| @@ -2,14 +2,14 @@
|
| // 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_DEFERRED_RENDERING_BACKING_STRATEGY_H_
|
| -#define CONTENT_COMMON_GPU_MEDIA_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_H_
|
| +#ifndef MEDIA_GPU_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_H_
|
| +#define MEDIA_GPU_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_H_
|
|
|
| #include <stdint.h>
|
|
|
| #include "base/macros.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 gl {
|
| class GLImage;
|
| @@ -22,7 +22,7 @@ class TextureRef;
|
| }
|
| }
|
|
|
| -namespace content {
|
| +namespace media {
|
|
|
| class AVDACodecImage;
|
| class AVDASharedState;
|
| @@ -31,7 +31,7 @@ class AVDASharedState;
|
| // a PictureBuffer's texture is used to draw, then draws using the surface
|
| // texture's front buffer rather than a copy. To do this, it uses a GLImage
|
| // implementation to talk to MediaCodec.
|
| -class CONTENT_EXPORT AndroidDeferredRenderingBackingStrategy
|
| +class MEDIA_GPU_EXPORT AndroidDeferredRenderingBackingStrategy
|
| : public AndroidVideoDecodeAccelerator::BackingStrategy {
|
| public:
|
| explicit AndroidDeferredRenderingBackingStrategy(
|
| @@ -96,6 +96,6 @@ class CONTENT_EXPORT AndroidDeferredRenderingBackingStrategy
|
| DISALLOW_COPY_AND_ASSIGN(AndroidDeferredRenderingBackingStrategy);
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace media
|
|
|
| -#endif // CONTENT_COMMON_GPU_MEDIA_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_H_
|
| +#endif // MEDIA_GPU_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_H_
|
|
|