Index: gpu/command_buffer/service/async_pixel_transfer_manager_share_group.h |
diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.h b/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.h |
index b415770369cb383cb1433b86b61d1060f88d33be..013fb1d3c34345c0e166547b65897c1b5a6341bf 100644 |
--- a/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.h |
+++ b/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.h |
@@ -8,7 +8,6 @@ |
#include "gpu/command_buffer/service/async_pixel_transfer_manager.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
namespace gfx { |
class GLContext; |
@@ -32,7 +31,6 @@ class AsyncPixelTransferManagerShareGroup : public AsyncPixelTransferManager { |
virtual base::TimeDelta GetTotalTextureUploadTime() OVERRIDE; |
virtual void ProcessMorePendingTransfers() OVERRIDE; |
virtual bool NeedsProcessMorePendingTransfers() OVERRIDE; |
- virtual AsyncPixelTransferDelegate* GetAsyncPixelTransferDelegate() OVERRIDE; |
// State shared between Managers and Delegates. |
struct SharedState { |
@@ -40,13 +38,18 @@ class AsyncPixelTransferManagerShareGroup : public AsyncPixelTransferManager { |
~SharedState(); |
scoped_refptr<AsyncPixelTransferUploadStats> texture_upload_stats; |
- typedef std::list<base::WeakPtr<AsyncPixelTransferState> > TransferQueue; |
+ typedef std::list<base::WeakPtr<AsyncPixelTransferDelegateShareGroup> > |
+ TransferQueue; |
TransferQueue pending_allocations; |
}; |
private: |
+ // AsyncPixelTransferManager implementation: |
+ virtual AsyncPixelTransferDelegate* CreatePixelTransferDelegateImpl( |
+ gles2::TextureRef* ref, |
+ const AsyncTexImage2DParams& define_params) OVERRIDE; |
+ |
SharedState shared_state_; |
- scoped_ptr<AsyncPixelTransferDelegateShareGroup> delegate_; |
DISALLOW_COPY_AND_ASSIGN(AsyncPixelTransferManagerShareGroup); |
}; |