Revert 134527 - Revert 134480 - Revert 134428 - GpuMemoryManager suggests values for renderer Conte…

content/common/gpu/gpu_command_buffer_stub.cc

  // Copyright (c) 2012 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.
 
 #if defined(ENABLE_GPU)
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 40 matching lines @@
     : channel_(channel),
       handle_(handle),
       initial_size_(size),
       disallowed_features_(disallowed_features),
       allowed_extensions_(allowed_extensions),
       requested_attribs_(attribs),
       gpu_preference_(gpu_preference),
       route_id_(route_id),
       software_(software),
       last_flush_count_(0),
-      allocation_(GpuMemoryAllocation::INVALID_RESOURCE_SIZE,
-                  GpuMemoryAllocation::kHasFrontbuffer |
-                  GpuMemoryAllocation::kHasBackbuffer),
+      allocation_(GpuMemoryAllocation::INVALID_RESOURCE_SIZE, true, true),
       parent_stub_for_initialization_(),
       parent_texture_for_initialization_(0),
       watchdog_(watchdog) {
   if (share_group) {
     context_group_ = share_group->context_group_;
   } else {
     context_group_ = new gpu::gles2::ContextGroup(true);
   }
   if (surface_id != 0)
     surface_state_.reset(new GpuCommandBufferStubBase::SurfaceState(
@@ skipping 51 matching lines @@
     IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuCommandBufferMsg_CreateVideoDecoder,
                                     OnCreateVideoDecoder)
     IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_DestroyVideoDecoder,
                         OnDestroyVideoDecoder)
     IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_SetSurfaceVisible,
                         OnSetSurfaceVisible)
     IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_DiscardBackbuffer,
                         OnDiscardBackbuffer)
     IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_EnsureBackbuffer,
                         OnEnsureBackbuffer)
-    IPC_MESSAGE_HANDLER(
-        GpuCommandBufferMsg_SetClientHasMemoryAllocationChangedCallback,
-        OnSetClientHasMemoryAllocationChangedCallback)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   DCHECK(handled);
   return handled;
 }
 
 bool GpuCommandBufferStub::Send(IPC::Message* message) {
   return channel_->Send(message);
 }
@@ skipping 438 matching lines @@
 }
 
 void GpuCommandBufferStub::OnEnsureBackbuffer() {
   if (!surface_)
     return;
   // TODO(mmocny): Support backbuffer without frontbuffer.
   surface_->SetBufferAllocation(
       gfx::GLSurface::BUFFER_ALLOCATION_FRONT_AND_BACK);
 }
 
-void GpuCommandBufferStub::OnSetClientHasMemoryAllocationChangedCallback(
-    bool has_callback) {
-  client_has_memory_allocation_changed_callback_ = has_callback;
-  channel_->gpu_channel_manager()->gpu_memory_manager()->ScheduleManage();
-}
-
 void GpuCommandBufferStub::SendConsoleMessage(
     int32 id,
     const std::string& message) {
   GPUCommandBufferConsoleMessage console_message;
   console_message.id = id;
   console_message.message = message;
   IPC::Message* msg = new GpuCommandBufferMsg_ConsoleMsg(
       route_id_, console_message);
   msg->set_unblock(true);
   Send(msg);
 }
 
 void GpuCommandBufferStub::AddDestructionObserver(
     DestructionObserver* observer) {
   destruction_observers_.AddObserver(observer);
 }
 
 void GpuCommandBufferStub::RemoveDestructionObserver(
     DestructionObserver* observer) {
   destruction_observers_.RemoveObserver(observer);
 }
 
 bool GpuCommandBufferStub::IsInSameContextShareGroup(
     const GpuCommandBufferStubBase& other) const {
   return context_group_ ==
       static_cast<const GpuCommandBufferStub&>(other).context_group_;
 }
 
-bool GpuCommandBufferStub::
-    client_has_memory_allocation_changed_callback() const {
-  return client_has_memory_allocation_changed_callback_;
-}
-
 bool GpuCommandBufferStub::has_surface_state() const {
   return surface_state_ != NULL;
 }
 
 const GpuCommandBufferStubBase::SurfaceState&
     GpuCommandBufferStub::surface_state() const {
   DCHECK(has_surface_state());
   return *surface_state_.get();
 }
 
 void GpuCommandBufferStub::SendMemoryAllocationToProxy(
     const GpuMemoryAllocation& allocation) {
   Send(new GpuCommandBufferMsg_SetMemoryAllocation(route_id_, allocation));
 }
 
 void GpuCommandBufferStub::SetMemoryAllocation(
     const GpuMemoryAllocation& allocation) {
   allocation_ = allocation;
 
   SendMemoryAllocationToProxy(allocation);
 }
 
 #endif  // defined(ENABLE_GPU)