Index: gpu/command_buffer/service/async_pixel_transfer_manager_egl.h |
diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager_egl.h b/gpu/command_buffer/service/async_pixel_transfer_manager_egl.h |
index 6354b2fd3e0f24fdef7c7c0e028a1a0550663a1c..b70732ee7b778ab2712d8dc6e9b056ce011ab983 100644 |
--- a/gpu/command_buffer/service/async_pixel_transfer_manager_egl.h |
+++ b/gpu/command_buffer/service/async_pixel_transfer_manager_egl.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 gpu { |
class AsyncPixelTransferDelegateEGL; |
@@ -28,7 +27,6 @@ class AsyncPixelTransferManagerEGL : 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 { |
@@ -38,13 +36,18 @@ class AsyncPixelTransferManagerEGL : public AsyncPixelTransferManager { |
scoped_refptr<AsyncPixelTransferUploadStats> texture_upload_stats; |
bool is_imagination; |
bool is_qualcomm; |
- typedef std::list<base::WeakPtr<AsyncPixelTransferState> > TransferQueue; |
+ typedef std::list<base::WeakPtr<AsyncPixelTransferDelegateEGL> > |
+ TransferQueue; |
TransferQueue pending_allocations; |
}; |
private: |
+ // AsyncPixelTransferManager implementation: |
+ virtual AsyncPixelTransferDelegate* CreatePixelTransferDelegateImpl( |
+ gles2::TextureRef* ref, |
+ const AsyncTexImage2DParams& define_params) OVERRIDE; |
+ |
SharedState shared_state_; |
- scoped_ptr<AsyncPixelTransferDelegateEGL> delegate_; |
DISALLOW_COPY_AND_ASSIGN(AsyncPixelTransferManagerEGL); |
}; |