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

ui/gl/async_pixel_transfer_delegate_stub.cc

 // 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.
 
 #include "ui/gl/async_pixel_transfer_delegate_stub.h"
 
 #include "base/shared_memory.h"
 #include "build/build_config.h"
+#include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "ui/gl/gl_bindings.h"
 
 using base::SharedMemory;
 using base::SharedMemoryHandle;
 
 namespace {
 // Gets the address of the data from shared memory.
 void* GetAddress(SharedMemory* shared_memory,
                  uint32 shm_size,
                  uint32 shm_data_offset,
@@ skipping 51 matching lines @@
 }
 
 AsyncPixelTransferState*
     AsyncPixelTransferDelegateStub::CreateRawPixelTransferState(
         GLuint texture_id) {
   return static_cast<AsyncPixelTransferState*>(
       new AsyncTransferStateStub(texture_id));
 }
 
 void AsyncPixelTransferDelegateStub::AsyncNotifyCompletion(
-    const base::Closure& task) {
-  task.Run();
+    const AsyncMemoryParams& mem_params,
+    uint32 submit_count) {
+  gpu::gles2::QuerySync* sync = static_cast<gpu::gles2::QuerySync*>(

[epenner, 2013/02/07 20:22:56]

See my earlier comment. I think the layering violation can be avoided with a
callback.

+      GetAddress(mem_params.shared_memory,
+                 mem_params.shm_size,
+                 mem_params.shm_data_offset,
+                 mem_params.shm_data_size));
+  if (!sync)
+    return;
+  sync->process_count = submit_count;
 }
 
 void AsyncPixelTransferDelegateStub::AsyncTexImage2D(
     AsyncPixelTransferState* transfer_state,
     const AsyncTexImage2DParams& tex_params,
     const AsyncMemoryParams& mem_params) {
   // Save the define params to return later during deferred
   // binding of the transfer texture.
   DCHECK(transfer_state);
   AsyncTransferStateStub* state =
@@ skipping 49 matching lines @@
 uint32 AsyncPixelTransferDelegateStub::GetTextureUploadCount() {
   return texture_upload_count_;
 }
 
 base::TimeDelta AsyncPixelTransferDelegateStub::GetTotalTextureUploadTime() {
   return total_texture_upload_time_;
 }
 
 }  // namespace gfx