Revert 260177 "By keeping track of transfer buffer usage (both s..."

trunk/src/gpu/command_buffer/client/mapped_memory.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 GPU_COMMAND_BUFFER_CLIENT_MAPPED_MEMORY_H_
 #define GPU_COMMAND_BUFFER_CLIENT_MAPPED_MEMORY_H_
 
-#include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "gpu/command_buffer/client/fenced_allocator.h"
 #include "gpu/command_buffer/common/buffer.h"
 #include "gpu/command_buffer/common/types.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 
 class CommandBufferHelper;
 
 // Manages a shared memory segment.
 class GPU_EXPORT MemoryChunk {
  public:
   MemoryChunk(int32 shm_id,
               scoped_refptr<gpu::Buffer> shm,
-              CommandBufferHelper* helper,
-              const base::Closure& poll_callback);
+              CommandBufferHelper* helper);
   ~MemoryChunk();
 
   // Gets the size of the largest free block that is available without waiting.
   unsigned int GetLargestFreeSizeWithoutWaiting() {
     return allocator_.GetLargestFreeSize();
   }
 
   // Gets the size of the largest free block that can be allocated if the
   // caller can wait.
   unsigned int GetLargestFreeSizeWithWaiting() {
@@ skipping 80 matching lines @@
 // Manages MemoryChunks.
 class GPU_EXPORT MappedMemoryManager {
  public:
   enum MemoryLimit {
     kNoLimit = 0,
   };
 
   // |unused_memory_reclaim_limit|: When exceeded this causes pending memory
   // to be reclaimed before allocating more memory.
   MappedMemoryManager(CommandBufferHelper* helper,
-                      const base::Closure& poll_callback,
                       size_t unused_memory_reclaim_limit);
 
   ~MappedMemoryManager();
 
   unsigned int chunk_size_multiple() const {
     return chunk_size_multiple_;
   }
 
   void set_chunk_size_multiple(unsigned int multiple) {
     chunk_size_multiple_ = multiple;
@@ skipping 24 matching lines @@
   void FreePendingToken(void* pointer, int32 token);
 
   // Free Any Shared memory that is not in use.
   void FreeUnused();
 
   // Used for testing
   size_t num_chunks() const {
     return chunks_.size();
   }
 
-  size_t bytes_in_use() const {
-    size_t bytes_in_use = 0;
-    for (size_t ii = 0; ii < chunks_.size(); ++ii) {
-      MemoryChunk* chunk = chunks_[ii];
-      bytes_in_use += chunk->bytes_in_use();
-    }
-    return bytes_in_use;
-  }
-
   // Used for testing
   size_t allocated_memory() const {
     return allocated_memory_;
   }
 
  private:
   typedef ScopedVector<MemoryChunk> MemoryChunkVector;
 
   // size a chunk is rounded up to.
   unsigned int chunk_size_multiple_;
   CommandBufferHelper* helper_;
-  base::Closure poll_callback_;
   MemoryChunkVector chunks_;
   size_t allocated_memory_;
   size_t max_free_bytes_;
 
   DISALLOW_COPY_AND_ASSIGN(MappedMemoryManager);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_MAPPED_MEMORY_H_