| Index: content/common/gpu/gpu_command_buffer_stub.h
|
| diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h
|
| index 83025c82b1ca377ca45569a8204c3c704d197aad..8e854dfc43f756d4dbefe1e8cc7985e72f7075b8 100644
|
| --- a/content/common/gpu/gpu_command_buffer_stub.h
|
| +++ b/content/common/gpu/gpu_command_buffer_stub.h
|
| @@ -98,7 +98,6 @@ class GpuCommandBufferStub
|
| // GpuMemoryManagerClient implementation:
|
| gfx::Size GetSurfaceSize() const override;
|
| gpu::gles2::MemoryTracker* GetMemoryTracker() const override;
|
| - void SetMemoryAllocation(const gpu::MemoryAllocation& allocation) override;
|
| void SuggestHaveFrontBuffer(bool suggest_have_frontbuffer) override;
|
| bool GetTotalGpuMemory(uint64* bytes) override;
|
|
|
| @@ -203,8 +202,6 @@ class GpuCommandBufferStub
|
| void OnSignalSyncPointAck(uint32 id);
|
| void OnSignalQuery(uint32 query, uint32 id);
|
|
|
| - void OnSetClientHasMemoryAllocationChangedCallback(bool has_callback);
|
| -
|
| void OnCreateImage(int32 id,
|
| gfx::GpuMemoryBufferHandle handle,
|
| gfx::Size size,
|
| @@ -268,12 +265,6 @@ class GpuCommandBufferStub
|
| scoped_ptr<gpu::SyncPointClient> sync_point_client_;
|
| scoped_refptr<gfx::GLSurface> surface_;
|
|
|
| - scoped_ptr<GpuMemoryManagerClientState> memory_manager_client_state_;
|
| - // The last memory allocation received from the GpuMemoryManager (used to
|
| - // elide redundant work).
|
| - bool last_memory_allocation_valid_;
|
| - gpu::MemoryAllocation last_memory_allocation_;
|
| -
|
| GpuWatchdog* watchdog_;
|
|
|
| base::ObserverList<DestructionObserver> destruction_observers_;
|
|
|