GPU: Replace AsyncPixelTransferState with AsyncPixelTransferDelegate.

gpu/command_buffer/service/async_pixel_transfer_delegate.h

 // Copyright (c) 2013 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_SERVICE_ASYNC_PIXEL_TRANSFER_DELEGATE_H_
 #define GPU_COMMAND_BUFFER_SERVICE_ASYNC_PIXEL_TRANSFER_DELEGATE_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "gpu/gpu_export.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace base {
 class SharedMemory;
 }
 
 namespace gpu {
@@ skipping 42 matching lines @@
 
   ~AsyncPixelTransferUploadStats();
 
   int texture_upload_count_;
   base::TimeDelta total_texture_upload_time_;
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(AsyncPixelTransferUploadStats);
 };
 
-// AsyncPixelTransferState holds the resources required to do async
-// transfers on one texture. It should stay alive for the lifetime
-// of the texture to allow multiple transfers.
-class GPU_EXPORT AsyncPixelTransferState
-    : public base::RefCounted<AsyncPixelTransferState>,
-      public base::SupportsWeakPtr<AsyncPixelTransferState> {
- public:
-  // Returns true if there is a transfer in progress.
-  virtual bool TransferIsInProgress() = 0;
-
- protected:
-  AsyncPixelTransferState();
-  virtual ~AsyncPixelTransferState();
-
- private:
-  friend class base::RefCounted<AsyncPixelTransferState>;
-
-  DISALLOW_COPY_AND_ASSIGN(AsyncPixelTransferState);
-};
-
 class GPU_EXPORT AsyncPixelTransferDelegate {
  public:
   virtual ~AsyncPixelTransferDelegate();
 
-  virtual AsyncPixelTransferState* CreatePixelTransferState(
-      GLuint texture_id,
-      const AsyncTexImage2DParams& define_params) = 0;
-
   // The callback occurs on the caller thread, once the texture is
   // safe/ready to be used.
   virtual void AsyncTexImage2D(
-      AsyncPixelTransferState* state,
       const AsyncTexImage2DParams& tex_params,
       const AsyncMemoryParams& mem_params,
       const base::Closure& bind_callback) = 0;
 
   virtual void AsyncTexSubImage2D(
-      AsyncPixelTransferState* state,
       const AsyncTexSubImage2DParams& tex_params,
       const AsyncMemoryParams& mem_params) = 0;
 
+  // Returns true if there is a transfer in progress.
+  virtual bool TransferIsInProgress() = 0;
+
   // Block until the specified transfer completes.
-  virtual void WaitForTransferCompletion(
-      AsyncPixelTransferState* state) = 0;
+  virtual void WaitForTransferCompletion() = 0;
 
   // Gets the address of the data from shared memory.
   static void* GetAddress(const AsyncMemoryParams& mem_params);
 
   // Sometimes the |safe_shared_memory| is duplicate to prevent use after free.
   static void* GetAddress(ScopedSafeSharedMemory* safe_shared_memory,
                           const AsyncMemoryParams& mem_params);
 
  protected:
   AsyncPixelTransferDelegate();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AsyncPixelTransferDelegate);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_ASYNC_PIXEL_TRANSFER_DELEGATE_H_