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

Unified Diff: media/gpu/ipc/service/gpu_video_decode_accelerator_factory_impl.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/ipc/service/gpu_video_decode_accelerator_factory_impl.h
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator_factory_impl.h b/media/gpu/ipc/service/gpu_video_decode_accelerator_factory_impl.h
similarity index 91%
rename from content/common/gpu/media/gpu_video_decode_accelerator_factory_impl.h
rename to media/gpu/ipc/service/gpu_video_decode_accelerator_factory_impl.h
index ba093263b88a98b7fa5837cc8fea846cf1daaef4..e604ba36e913597f0dd555e1018b11c4116154fe 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator_factory_impl.h
+++ b/media/gpu/ipc/service/gpu_video_decode_accelerator_factory_impl.h
@@ -2,12 +2,11 @@
// 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_GPU_VIDEO_DECODE_ACCELERATOR_FACTORY_IMPL_H_
-#define CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_FACTORY_IMPL_H_
+#ifndef MEDIA_GPU_IPC_SERVICE_GPU_VIDEO_DECODE_ACCELERATOR_FACTORY_IMPL_H_
+#define MEDIA_GPU_IPC_SERVICE_GPU_VIDEO_DECODE_ACCELERATOR_FACTORY_IMPL_H_
#include "base/callback.h"
#include "base/threading/thread_checker.h"
-#include "content/common/content_export.h"
#include "gpu/command_buffer/service/gpu_preferences.h"
#include "gpu/config/gpu_info.h"
#include "media/video/video_decode_accelerator.h"
@@ -28,13 +27,13 @@ class GLES2Decoder;
}
}
-namespace content {
+namespace media {
// TODO(posciak): this class should be an implementation of
// content::GpuVideoDecodeAcceleratorFactory, however that can only be achieved
// once this is moved out of content/common, see crbug.com/597150 and related.
-class CONTENT_EXPORT GpuVideoDecodeAcceleratorFactoryImpl {
-public:
+class GpuVideoDecodeAcceleratorFactoryImpl {
+ public:
~GpuVideoDecodeAcceleratorFactoryImpl();
// Return current GLContext.
@@ -118,6 +117,6 @@ public:
DISALLOW_IMPLICIT_CONSTRUCTORS(GpuVideoDecodeAcceleratorFactoryImpl);
};
-} // namespace content
+} // namespace media
-#endif // CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_FACTORY_IMPL_H_
+#endif // MEDIA_GPU_IPC_SERVICE_GPU_VIDEO_DECODE_ACCELERATOR_FACTORY_IMPL_H_

Powered by Google App Engine
This is Rietveld 408576698