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

trunk/src/gpu/command_buffer/client/fenced_allocator.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.
 
 // This file contains the definition of the FencedAllocator class.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_FENCED_ALLOCATOR_H_
 #define GPU_COMMAND_BUFFER_CLIENT_FENCED_ALLOCATOR_H_
 
 #include <vector>
 
-#include "base/bind.h"
 #include "base/logging.h"
 #include "gpu/command_buffer/common/types.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 class CommandBufferHelper;
 
 // FencedAllocator provides a mechanism to manage allocations within a fixed
 // block of memory (storing the book-keeping externally). Furthermore this
 // class allows to free data "pending" the passage of a command buffer token,
 // that is, the memory won't be reused until the command buffer has processed
 // that token.
 //
 // NOTE: Although this class is intended to be used in the command buffer
 // environment which is multi-process, this class isn't "thread safe", because
 // it isn't meant to be shared across modules. It is thread-compatible though
 // (see http://www.corp.google.com/eng/doc/cpp_primer.html#thread_safety).
 class GPU_EXPORT FencedAllocator {
  public:
   typedef unsigned int Offset;
   // Invalid offset, returned by Alloc in case of failure.
   static const Offset kInvalidOffset = 0xffffffffU;
 
   // Creates a FencedAllocator. Note that the size of the buffer is passed, but
   // not its base address: everything is handled as offsets into the buffer.
   FencedAllocator(unsigned int size,
-                  CommandBufferHelper *helper,
-                  const base::Closure& poll_callback);
+                  CommandBufferHelper *helper);
 
   ~FencedAllocator();
 
   // Allocates a block of memory. If the buffer is out of directly available
   // memory, this function may wait until memory that was freed "pending a
   // token" can be re-used.
   //
   // Parameters:
   //   size: the size of the memory block to allocate.
   //
@@ skipping 80 matching lines @@
   BlockIndex WaitForTokenAndFreeBlock(BlockIndex index);
 
   // Allocates a block of memory inside a given block, splitting it in two
   // (unless that block is of the exact requested size).
   // NOTE: this will invalidate block indices.
   // Returns the offset of the allocated block (NOTE: this is different from
   // the other functions that return a block index).
   Offset AllocInBlock(BlockIndex index, unsigned int size);
 
   CommandBufferHelper *helper_;
-  base::Closure poll_callback_;
   Container blocks_;
   size_t bytes_in_use_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(FencedAllocator);
 };
 
 // This class functions just like FencedAllocator, but its API uses pointers
 // instead of offsets.
 class FencedAllocatorWrapper {
  public:
   FencedAllocatorWrapper(unsigned int size,
                          CommandBufferHelper* helper,
-                         const base::Closure& poll_callback,
                          void* base)
-      : allocator_(size, helper, poll_callback),
+      : allocator_(size, helper),
         base_(base) { }
 
   // Allocates a block of memory. If the buffer is out of directly available
   // memory, this function may wait until memory that was freed "pending a
   // token" can be re-used.
   //
   // Parameters:
   //   size: the size of the memory block to allocate.
   //
   // Returns:
@@ skipping 88 matching lines @@
 
  private:
   FencedAllocator allocator_;
   void* base_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(FencedAllocatorWrapper);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_FENCED_ALLOCATOR_H_