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

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

Issue 2709163004: Rename GpuMemoryBufferFactoryOzoneNativePixmap to GpuMemoryBufferFactoryNativePixmap (Closed)
Patch Set: Rebase and addressed reveman's remark. Created 3 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/gpu/ipc/service/gpu_memory_buffer_factory_ozone_native_pixmap.h b/gpu/ipc/service/gpu_memory_buffer_factory_ozone_native_pixmap.h
deleted file mode 100644
index 9bb4db7ce5e1cdb707e391b87782994e3f5359dd..0000000000000000000000000000000000000000
--- a/gpu/ipc/service/gpu_memory_buffer_factory_ozone_native_pixmap.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#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 <unordered_map>
-#include <utility>
-
-#include "base/hash.h"
-#include "base/macros.h"
-#include "base/synchronization/lock.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/gfx/native_pixmap.h"
-
-namespace gl {
-class GLImage;
-}
-
-namespace gpu {
-
-class GPU_EXPORT GpuMemoryBufferFactoryOzoneNativePixmap
- : public GpuMemoryBufferFactory,
- public ImageFactory {
- public:
- GpuMemoryBufferFactoryOzoneNativePixmap();
- ~GpuMemoryBufferFactoryOzoneNativePixmap() override;
-
- // Overridden from GpuMemoryBufferFactory:
- gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
- gfx::GpuMemoryBufferId id,
- const gfx::Size& size,
- gfx::BufferFormat format,
- gfx::BufferUsage usage,
- int client_id,
- SurfaceHandle surface_handle) override;
- void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
- int client_id) override;
- ImageFactory* AsImageFactory() override;
-
- // Overridden from ImageFactory:
- scoped_refptr<gl::GLImage> CreateImageForGpuMemoryBuffer(
- const gfx::GpuMemoryBufferHandle& handle,
- const gfx::Size& size,
- gfx::BufferFormat format,
- unsigned internalformat,
- int client_id,
- SurfaceHandle surface_handle) override;
- scoped_refptr<gl::GLImage> CreateAnonymousImage(
- const gfx::Size& size,
- gfx::BufferFormat format,
- unsigned internalformat) override;
- unsigned RequiredTextureType() override;
-
- private:
- using NativePixmapMapKey = std::pair<int, int>;
- using NativePixmapMapKeyHash = base::IntPairHash<NativePixmapMapKey>;
- using NativePixmapMap = std::unordered_map<NativePixmapMapKey,
- scoped_refptr<gfx::NativePixmap>,
- NativePixmapMapKeyHash>;
- NativePixmapMap native_pixmaps_;
- base::Lock native_pixmaps_lock_;
-
- DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferFactoryOzoneNativePixmap);
-};
-
-} // namespace gpu
-
-#endif // GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_OZONE_NATIVE_PIXMAP_H_

Powered by Google App Engine
This is Rietveld 408576698