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

Unified Diff: gpu/ipc/service/gpu_memory_buffer_factory_ozone_native_pixmap.h

Issue 1845563005: Refactor content/common/gpu into gpu/ipc/service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Drop ref to deleted content_tests_gypi_values.content_unittests_ozone_sources 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: gpu/ipc/service/gpu_memory_buffer_factory_ozone_native_pixmap.h
diff --git a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h b/gpu/ipc/service/gpu_memory_buffer_factory_ozone_native_pixmap.h
similarity index 73%
rename from content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h
rename to gpu/ipc/service/gpu_memory_buffer_factory_ozone_native_pixmap.h
index c7d0c7614421680ab9f2056566d50a791b3967d8..07ff293e4154c821bd5e37e2ff32685eda297682 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h
+++ b/gpu/ipc/service/gpu_memory_buffer_factory_ozone_native_pixmap.h
@@ -2,26 +2,26 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_OZONE_NATIVE_PIXMAP_H_
-#define CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_OZONE_NATIVE_PIXMAP_H_
+#ifndef GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_OZONE_NATIVE_PIXMAP_H_
+#define GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_OZONE_NATIVE_PIXMAP_H_
#include "base/containers/hash_tables.h"
#include "base/macros.h"
#include "base/synchronization/lock.h"
-#include "content/common/content_export.h"
-#include "content/common/gpu/gpu_memory_buffer_factory.h"
#include "gpu/command_buffer/service/image_factory.h"
+#include "gpu/gpu_export.h"
+#include "gpu/ipc/service/gpu_memory_buffer_factory.h"
#include "ui/ozone/public/native_pixmap.h"
namespace gl {
class GLImage;
}
-namespace content {
+namespace gpu {
-class CONTENT_EXPORT GpuMemoryBufferFactoryOzoneNativePixmap
+class GPU_EXPORT GpuMemoryBufferFactoryOzoneNativePixmap
: public GpuMemoryBufferFactory,
- public gpu::ImageFactory {
+ public ImageFactory {
public:
GpuMemoryBufferFactoryOzoneNativePixmap();
~GpuMemoryBufferFactoryOzoneNativePixmap() override;
@@ -33,7 +33,7 @@ class CONTENT_EXPORT GpuMemoryBufferFactoryOzoneNativePixmap
gfx::BufferFormat format,
gfx::BufferUsage usage,
int client_id,
- gpu::SurfaceHandle surface_handle) override;
+ SurfaceHandle surface_handle) override;
gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferFromHandle(
const gfx::GpuMemoryBufferHandle& handle,
gfx::GpuMemoryBufferId id,
@@ -42,9 +42,9 @@ class CONTENT_EXPORT GpuMemoryBufferFactoryOzoneNativePixmap
int client_id) override;
void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
int client_id) override;
- gpu::ImageFactory* AsImageFactory() override;
+ ImageFactory* AsImageFactory() override;
- // Overridden from gpu::ImageFactory:
+ // Overridden from ImageFactory:
scoped_refptr<gl::GLImage> CreateImageForGpuMemoryBuffer(
const gfx::GpuMemoryBufferHandle& handle,
const gfx::Size& size,
@@ -62,6 +62,6 @@ class CONTENT_EXPORT GpuMemoryBufferFactoryOzoneNativePixmap
DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferFactoryOzoneNativePixmap);
};
-} // namespace content
+} // namespace gpu
-#endif // CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_OZONE_NATIVE_PIXMAP_H_
+#endif // GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_OZONE_NATIVE_PIXMAP_H_

Powered by Google App Engine
This is Rietveld 408576698