Revert of Move gpu memory calculations to Compositor.

content/common/gpu/gpu_command_buffer_stub.h

 // 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.
 
 #ifndef CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
 #define CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 83 matching lines @@
 
   // IPC::Listener implementation:
   bool OnMessageReceived(const IPC::Message& message) override;
 
   // IPC::Sender implementation:
   bool Send(IPC::Message* msg) override;
 
   // 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;
 
   // Whether this command buffer can currently handle IPC messages.
   bool IsScheduled();
 
   // Whether there are commands in the buffer that haven't been processed.
   bool HasUnprocessedCommands();
 
   gpu::gles2::GLES2Decoder* decoder() const { return decoder_.get(); }
@@ skipping 93 matching lines @@
   void OnSignalQuery(uint32 query, uint32 id);
 
   void OnFenceSyncRelease(uint64_t release);
   bool OnWaitFenceSync(gpu::CommandBufferNamespace namespace_id,
                        uint64_t command_buffer_id,
                        uint64_t release);
   void OnWaitFenceSyncCompleted(gpu::CommandBufferNamespace namespace_id,
                                 uint64_t command_buffer_id,
                                 uint64_t release);
 
+  void OnSetClientHasMemoryAllocationChangedCallback(bool has_callback);
+
   void OnCreateImage(int32 id,
                      gfx::GpuMemoryBufferHandle handle,
                      gfx::Size size,
                      gfx::BufferFormat format,
                      uint32 internalformat);
   void OnDestroyImage(int32 id);
   void OnCreateStreamTexture(uint32 texture_id,
                              int32 stream_id,
                              bool* succeeded);
 
@@ skipping 48 matching lines @@
   const int32 route_id_;
   const bool offscreen_;
   uint32 last_flush_count_;
 
   scoped_ptr<gpu::CommandBufferService> command_buffer_;
   scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
   scoped_ptr<gpu::GpuScheduler> scheduler_;
   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_;
 
   // A queue of sync points associated with this stub.
   std::deque<uint32> sync_points_;
   bool waiting_for_sync_point_;
 
   base::TimeTicks process_delayed_work_time_;
   uint32_t previous_processed_num_;
   base::TimeTicks last_idle_time_;
 
   scoped_refptr<gpu::PreemptionFlag> preemption_flag_;
 
   LatencyInfoCallback latency_info_callback_;
 
   GURL active_url_;
   size_t active_url_hash_;
 
   size_t total_gpu_memory_;
   scoped_ptr<WaitForCommandState> wait_for_token_;
   scoped_ptr<WaitForCommandState> wait_for_get_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_