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

Unified Diff: content/browser/gpu/browser_gpu_memory_buffer_manager.h

Issue 2087673002: Remove CreateGpuMemoryBufferFromClientId and plumbing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 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: content/browser/gpu/browser_gpu_memory_buffer_manager.h
diff --git a/content/browser/gpu/browser_gpu_memory_buffer_manager.h b/content/browser/gpu/browser_gpu_memory_buffer_manager.h
index fbca36a89c2c1ef0ca0278b2c24b9789769dda77..87166e22babbe3db79499cfb060b7bf7b9b04d3f 100644
--- a/content/browser/gpu/browser_gpu_memory_buffer_manager.h
+++ b/content/browser/gpu/browser_gpu_memory_buffer_manager.h
@@ -29,10 +29,6 @@ using GpuMemoryBufferConfigurationSet =
} // content
-namespace gpu {
-class GpuMemoryBufferImpl;
-} // gpu
-
namespace BASE_HASH_NAMESPACE {
template <>
@@ -77,9 +73,6 @@ class CONTENT_EXPORT BrowserGpuMemoryBufferManager
const gfx::GpuMemoryBufferHandle& handle,
const gfx::Size& size,
gfx::BufferFormat format) override;
- std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBufferFromClientId(
- int client_id,
- const gfx::GpuMemoryBufferId& gpu_memory_buffer_id) override;
gfx::GpuMemoryBuffer* GpuMemoryBufferFromClientBuffer(
ClientBuffer buffer) override;
void SetDestructionSyncToken(gfx::GpuMemoryBuffer* buffer,
@@ -115,7 +108,7 @@ class CONTENT_EXPORT BrowserGpuMemoryBufferManager
gfx::BufferFormat format,
gfx::BufferUsage usage,
int gpu_host_id);
- BufferInfo(BufferInfo&& other);
+ BufferInfo(const BufferInfo& other);
~BufferInfo();
gfx::Size size;
@@ -123,16 +116,10 @@ class CONTENT_EXPORT BrowserGpuMemoryBufferManager
gfx::BufferFormat format = gfx::BufferFormat::RGBA_8888;
gfx::BufferUsage usage = gfx::BufferUsage::GPU_READ;
int gpu_host_id = 0;
-
- // An open instance of the buffer in the browser process.
- // TODO(ccameron): This only is implemented for IOSurface buffers. Ensure
- // that this is always valid, and delete the then-redundant above state.
- std::unique_ptr<gpu::GpuMemoryBufferImpl> buffer;
};
struct CreateGpuMemoryBufferRequest;
struct CreateGpuMemoryBufferFromHandleRequest;
- struct CreateGpuMemoryBufferFromClientIdRequest;
using CreateDelegate = base::Callback<void(GpuProcessHost* host,
gfx::GpuMemoryBufferId id,
@@ -152,8 +139,6 @@ class CONTENT_EXPORT BrowserGpuMemoryBufferManager
void HandleCreateGpuMemoryBufferOnIO(CreateGpuMemoryBufferRequest* request);
void HandleCreateGpuMemoryBufferFromHandleOnIO(
CreateGpuMemoryBufferFromHandleRequest* request);
- void HandleCreateGpuMemoryBufferFromClientIdOnIO(
- CreateGpuMemoryBufferFromClientIdRequest* request);
void HandleGpuMemoryBufferCreatedOnIO(
CreateGpuMemoryBufferRequest* request,
const gfx::GpuMemoryBufferHandle& handle);
« no previous file with comments | « components/mus/surfaces/ozone_gpu_memory_buffer_manager.cc ('k') | content/browser/gpu/browser_gpu_memory_buffer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698