| Index: content/common/gpu/client/gpu_memory_buffer_impl.h
|
| diff --git a/content/common/gpu/client/gpu_memory_buffer_impl.h b/content/common/gpu/client/gpu_memory_buffer_impl.h
|
| index 727e54125adc5f952bebb447100ed944c6aa42c6..ac2a73e3a8b2d8c9465040e611fad26fbb2f0e2c 100644
|
| --- a/content/common/gpu/client/gpu_memory_buffer_impl.h
|
| +++ b/content/common/gpu/client/gpu_memory_buffer_impl.h
|
| @@ -19,7 +19,7 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
|
| CreationCallback;
|
| typedef base::Callback<void(const gfx::GpuMemoryBufferHandle& handle)>
|
| AllocationCallback;
|
| - typedef base::Closure DestructionCallback;
|
| + typedef base::Callback<void(uint32 sync_point)> DestructionCallback;
|
|
|
| ~GpuMemoryBufferImpl() override;
|
|
|
| @@ -44,7 +44,8 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
|
| // Notify that GPU memory buffer has been deleted by |child_process|.
|
| static void DeletedByChildProcess(gfx::GpuMemoryBufferType type,
|
| const gfx::GpuMemoryBufferId& id,
|
| - base::ProcessHandle child_process);
|
| + base::ProcessHandle child_process,
|
| + uint32 sync_point);
|
|
|
| // Creates an instance from the given |handle|. |size| and |internalformat|
|
| // should match what was used to allocate the |handle|. |callback| is
|
| @@ -68,6 +69,10 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
|
| Format GetFormat() const override;
|
| ClientBuffer AsClientBuffer() override;
|
|
|
| + void set_destruction_sync_point(uint32 sync_point) {
|
| + destruction_sync_point_ = sync_point;
|
| + }
|
| +
|
| protected:
|
| GpuMemoryBufferImpl(const gfx::Size& size,
|
| Format format,
|
| @@ -77,6 +82,7 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
|
| const Format format_;
|
| const DestructionCallback callback_;
|
| bool mapped_;
|
| + uint32 destruction_sync_point_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferImpl);
|
| };
|
|
|