Re-land: Mark async texture uploads as completed from the upload thread.

ui/gl/async_pixel_transfer_delegate.h

 // Copyright (c) 2011 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 UI_GL_ASYNC_TASK_DELEGATE_H_
 #define UI_GL_ASYNC_TASK_DELEGATE_H_
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 60 matching lines @@
   friend class base::RefCounted<AsyncPixelTransferState>;
   AsyncPixelTransferState() {}
 
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AsyncPixelTransferState);
 };
 
 class GL_EXPORT AsyncPixelTransferDelegate {
  public:
+  typedef base::Callback<void(const AsyncMemoryParams&)> CompletionCallback;
+
   static scoped_ptr<AsyncPixelTransferDelegate>
       Create(gfx::GLContext* context);
   virtual ~AsyncPixelTransferDelegate() {}
 
   // This wouldn't work with MOCK_METHOD, so it routes through
   // a virtual protected version which returns a raw pointer.
   scoped_ptr<AsyncPixelTransferState>
       CreatePixelTransferState(GLuint texture_id) {
     return make_scoped_ptr(CreateRawPixelTransferState(texture_id));
   }
 
+  // There's no guarantee that callback will run on the caller thread.
   virtual void AsyncNotifyCompletion(
-      const base::Closure& notify_task) = 0;
+      const AsyncMemoryParams& mem_params,
+      const CompletionCallback& callback) = 0;
 
   virtual void AsyncTexImage2D(
       AsyncPixelTransferState* state,
       const AsyncTexImage2DParams& tex_params,
       const AsyncMemoryParams& mem_params) = 0;
 
   virtual void AsyncTexSubImage2D(
       AsyncPixelTransferState* state,
       const AsyncTexSubImage2DParams& tex_params,
       const AsyncMemoryParams& mem_params) = 0;
 
   virtual uint32 GetTextureUploadCount() = 0;
   virtual base::TimeDelta GetTotalTextureUploadTime() = 0;
 
  protected:
   AsyncPixelTransferDelegate() {}
   // For testing, as returning scoped_ptr wouldn't work with MOCK_METHOD.
   virtual AsyncPixelTransferState*
       CreateRawPixelTransferState(GLuint texture_id) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AsyncPixelTransferDelegate);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GL_ASYNC_TASK_DELEGATE_H_