Index: content/common/gpu/gpu_command_buffer_stub.cc |
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc |
index 407ac03b1fbfb92011eb4bb31de74c4a0a855b09..f32055bb47b51cca7334b7865dffd874e1f3d8c6 100644 |
--- a/content/common/gpu/gpu_command_buffer_stub.cc |
+++ b/content/common/gpu/gpu_command_buffer_stub.cc |
@@ -261,9 +261,7 @@ bool GpuCommandBufferStub::OnMessageReceived(const IPC::Message& message) { |
message.type() != GpuCommandBufferMsg_RegisterTransferBuffer::ID && |
message.type() != GpuCommandBufferMsg_DestroyTransferBuffer::ID && |
message.type() != GpuCommandBufferMsg_RetireSyncPoint::ID && |
- message.type() != GpuCommandBufferMsg_SignalSyncPoint::ID && |
- message.type() != |
- GpuCommandBufferMsg_SetClientHasMemoryAllocationChangedCallback::ID) { |
+ message.type() != GpuCommandBufferMsg_SignalSyncPoint::ID) { |
if (!MakeCurrent()) |
return false; |
have_context = true; |
@@ -301,9 +299,6 @@ bool GpuCommandBufferStub::OnMessageReceived(const IPC::Message& message) { |
OnSignalSyncPoint) |
IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_SignalQuery, |
OnSignalQuery) |
- IPC_MESSAGE_HANDLER( |
- GpuCommandBufferMsg_SetClientHasMemoryAllocationChangedCallback, |
- OnSetClientHasMemoryAllocationChangedCallback) |
IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_CreateImage, OnCreateImage); |
IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_DestroyImage, OnDestroyImage); |
IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_CreateStreamTexture, |
@@ -977,22 +972,6 @@ void GpuCommandBufferStub::OnSignalQuery(uint32 query_id, uint32 id) { |
OnSignalSyncPointAck(id); |
} |
- |
-void GpuCommandBufferStub::OnSetClientHasMemoryAllocationChangedCallback( |
- bool has_callback) { |
- TRACE_EVENT0( |
- "gpu", |
- "GpuCommandBufferStub::OnSetClientHasMemoryAllocationChangedCallback"); |
- if (has_callback) { |
- if (!memory_manager_client_state_) { |
- memory_manager_client_state_.reset(GetMemoryManager()->CreateClientState( |
- this, surface_id_ != 0, true)); |
- } |
- } else { |
- memory_manager_client_state_.reset(); |
- } |
-} |
- |
void GpuCommandBufferStub::OnCreateImage(int32 id, |
gfx::GpuMemoryBufferHandle handle, |
gfx::Size size, |
@@ -1105,18 +1084,6 @@ gpu::gles2::MemoryTracker* GpuCommandBufferStub::GetMemoryTracker() const { |
return context_group_->memory_tracker(); |
} |
-void GpuCommandBufferStub::SetMemoryAllocation( |
- const gpu::MemoryAllocation& allocation) { |
- if (!last_memory_allocation_valid_ || |
- !allocation.Equals(last_memory_allocation_)) { |
- Send(new GpuCommandBufferMsg_SetMemoryAllocation( |
- route_id_, allocation)); |
- } |
- |
- last_memory_allocation_valid_ = true; |
- last_memory_allocation_ = allocation; |
-} |
- |
void GpuCommandBufferStub::SuggestHaveFrontBuffer( |
bool suggest_have_frontbuffer) { |
// This can be called outside of OnMessageReceived, so the context needs |