| Index: trunk/src/gpu/command_buffer/service/async_pixel_transfer_manager_idle.cc
|
| ===================================================================
|
| --- trunk/src/gpu/command_buffer/service/async_pixel_transfer_manager_idle.cc (revision 260192)
|
| +++ trunk/src/gpu/command_buffer/service/async_pixel_transfer_manager_idle.cc (working copy)
|
| @@ -89,7 +89,6 @@
|
|
|
| shared_state_->tasks.push_back(AsyncPixelTransferManagerIdle::Task(
|
| id_,
|
| - this,
|
| base::Bind(&AsyncPixelTransferDelegateIdle::PerformAsyncTexImage2D,
|
| AsWeakPtr(),
|
| tex_params,
|
| @@ -107,7 +106,6 @@
|
|
|
| shared_state_->tasks.push_back(AsyncPixelTransferManagerIdle::Task(
|
| id_,
|
| - this,
|
| base::Bind(&AsyncPixelTransferDelegateIdle::PerformAsyncTexSubImage2D,
|
| AsWeakPtr(),
|
| tex_params,
|
| @@ -226,11 +224,8 @@
|
| }
|
|
|
| AsyncPixelTransferManagerIdle::Task::Task(
|
| - uint64 transfer_id,
|
| - AsyncPixelTransferDelegate* delegate,
|
| - const base::Closure& task)
|
| + uint64 transfer_id, const base::Closure& task)
|
| : transfer_id(transfer_id),
|
| - delegate(delegate),
|
| task(task) {
|
| }
|
|
|
| @@ -272,7 +267,6 @@
|
|
|
| shared_state_.tasks.push_back(
|
| Task(0, // 0 transfer_id for notification tasks.
|
| - NULL,
|
| base::Bind(
|
| &PerformNotifyCompletion,
|
| mem_params,
|
| @@ -303,15 +297,6 @@
|
| return !shared_state_.tasks.empty();
|
| }
|
|
|
| -void AsyncPixelTransferManagerIdle::WaitAllAsyncTexImage2D() {
|
| - if (shared_state_.tasks.empty())
|
| - return;
|
| -
|
| - const Task& task = shared_state_.tasks.back();
|
| - if (task.delegate)
|
| - task.delegate->WaitForTransferCompletion();
|
| -}
|
| -
|
| AsyncPixelTransferDelegate*
|
| AsyncPixelTransferManagerIdle::CreatePixelTransferDelegateImpl(
|
| gles2::TextureRef* ref,
|
|
|