GPU: Replace AsyncPixelTransferState with AsyncPixelTransferDelegate.

GPU: Replace AsyncPixelTransferState with AsyncPixelTransferDelegate.

Manager now manages Delegates instead of States. Delegate now owns
State. State is now hidden in the implementation files.

BUG=240504
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=205849

[jonathan.backer, 2013-06-07 15:08:50]

This step of the refactor touches the API so I had to touch all of the files.
Sorry.

There are a couple of TODOs in there that I will address in follow-up CLs. I
wanted to keep this change as trivial as possible to make it easier to review.

[jonathan.backer, 2013-06-11 20:37:27]

@piman: I addressed the comments as per our discussion:
- removed the ref count on Delegate by using a linked_ptr
- putting the weak_ptr on the Delegate instead of the State because the Delegate
only lives on the main thread (whereas the state could have been invalidated on
the main or upload thread).

[piman, 2013-06-11 22:12:17]

lgtm

[commit-bot: I haz the power, 2013-06-12 13:12:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/16175005/17002

[commit-bot: I haz the power, 2013-06-12 13:12:11]

Failed to apply patch for
gpu/command_buffer/service/async_pixel_transfer_manager.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file gpu/command_buffer/service/async_pixel_transfer_manager.cc
  Hunk #1 FAILED at 20.
  1 out of 2 hunks FAILED -- saving rejects to file
gpu/command_buffer/service/async_pixel_transfer_manager.cc.rej

Patch:       gpu/command_buffer/service/async_pixel_transfer_manager.cc
Index: gpu/command_buffer/service/async_pixel_transfer_manager.cc
diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager.cc
b/gpu/command_buffer/service/async_pixel_transfer_manager.cc
index
6b4ad9120aa740e34861d1c105f2092525384017..59a1462374d8bf8f1b49bff397ca7c35e94ea46b
100644
--- a/gpu/command_buffer/service/async_pixel_transfer_manager.cc
+++ b/gpu/command_buffer/service/async_pixel_transfer_manager.cc
@@ -20,39 +20,39 @@ void
AsyncPixelTransferManager::Initialize(gles2::TextureManager* manager) {
   manager_->AddObserver(this);
 }
 
-AsyncPixelTransferState* AsyncPixelTransferManager::CreatePixelTransferState(
+AsyncPixelTransferDelegate*
+AsyncPixelTransferManager::CreatePixelTransferDelegate(
     gles2::TextureRef* ref,
     const AsyncTexImage2DParams& define_params) {
-  DCHECK(!GetPixelTransferState(ref));
-  AsyncPixelTransferState* state =
-      GetAsyncPixelTransferDelegate()->CreatePixelTransferState(
-          ref->texture()->service_id(), define_params);
-  state_map_[ref] = state;
-  return state;
+  DCHECK(!GetPixelTransferDelegate(ref));
+  AsyncPixelTransferDelegate* delegate =
+      CreatePixelTransferDelegateImpl(ref, define_params);
+  delegate_map_[ref] = make_linked_ptr(delegate);
+  return delegate;
 }
 
-AsyncPixelTransferState*
-AsyncPixelTransferManager::GetPixelTransferState(
+AsyncPixelTransferDelegate*
+AsyncPixelTransferManager::GetPixelTransferDelegate(
     gles2::TextureRef* ref) {
-  TextureToStateMap::iterator it = state_map_.find(ref);
-  if (it == state_map_.end()) {
+  TextureToDelegateMap::iterator it = delegate_map_.find(ref);
+  if (it == delegate_map_.end()) {
     return NULL;
   } else {
-    return it->second;
+    return it->second.get();
   }
 }
 
-void AsyncPixelTransferManager::ClearPixelTransferStateForTest(
+void AsyncPixelTransferManager::ClearPixelTransferDelegateForTest(
     gles2::TextureRef* ref) {
-  TextureToStateMap::iterator it = state_map_.find(ref);
-  if (it != state_map_.end())
-    state_map_.erase(it);
+  TextureToDelegateMap::iterator it = delegate_map_.find(ref);
+  if (it != delegate_map_.end())
+    delegate_map_.erase(it);
 }
 
 bool AsyncPixelTransferManager::AsyncTransferIsInProgress(
     gles2::TextureRef* ref) {
-  AsyncPixelTransferState* state = GetPixelTransferState(ref);
-  return state && state->TransferIsInProgress();
+  AsyncPixelTransferDelegate* delegate = GetPixelTransferDelegate(ref);
+  return delegate && delegate->TransferIsInProgress();
 }
 
 void AsyncPixelTransferManager::OnTextureManagerDestroying(
@@ -64,9 +64,9 @@ void AsyncPixelTransferManager::OnTextureManagerDestroying(
 
 void AsyncPixelTransferManager::OnTextureRefDestroying(
     gles2::TextureRef* texture) {
-  TextureToStateMap::iterator it = state_map_.find(texture);
-  if (it != state_map_.end())
-    state_map_.erase(it);
+  TextureToDelegateMap::iterator it = delegate_map_.find(texture);
+  if (it != delegate_map_.end())
+    delegate_map_.erase(it);
 }
 
 }  // namespace gpu

[commit-bot: I haz the power, 2013-06-12 13:22:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/16175005/84001

[commit-bot: I haz the power, 2013-06-12 17:27:21]

Change committed as 205849