Index: ui/gl/async_pixel_transfer_delegate_stub.cc |
diff --git a/ui/gl/async_pixel_transfer_delegate_stub.cc b/ui/gl/async_pixel_transfer_delegate_stub.cc |
index 2ec16bbcff4adaae952960a31151301053a852ed..e3835a2a378929fba4bc9bccdf47bf94f3fc1a15 100644 |
--- a/ui/gl/async_pixel_transfer_delegate_stub.cc |
+++ b/ui/gl/async_pixel_transfer_delegate_stub.cc |
@@ -18,7 +18,7 @@ void* GetAddress(SharedMemory* shared_memory, |
uint32 shm_data_offset, |
uint32 shm_data_size) { |
// Memory bounds have already been validated, so there |
- // is just DCHECKS here. |
+ // are just DCHECKS here. |
DCHECK(shared_memory); |
DCHECK(shared_memory->memory()); |
DCHECK_LE(shm_data_offset + shm_data_size, shm_size); |
@@ -28,13 +28,6 @@ void* GetAddress(SharedMemory* shared_memory, |
namespace gfx { |
-#if !defined(OS_ANDROID) |
-scoped_ptr<AsyncPixelTransferDelegate> |
- AsyncPixelTransferDelegate::Create(gfx::GLContext* context) { |
- return AsyncPixelTransferDelegateStub::Create(context); |
-} |
-#endif |
- |
scoped_ptr<AsyncPixelTransferDelegate> |
AsyncPixelTransferDelegateStub::Create(gfx::GLContext* context) { |
return make_scoped_ptr( |
@@ -63,8 +56,7 @@ AsyncPixelTransferState* |
AsyncPixelTransferDelegateStub::CreateRawPixelTransferState( |
GLuint texture_id, |
const AsyncTexImage2DParams& define_params) { |
- return static_cast<AsyncPixelTransferState*>( |
- new AsyncTransferStateStub(texture_id)); |
+ return new AsyncTransferStateStub(texture_id); |
} |
bool AsyncPixelTransferDelegateStub::BindCompletedAsyncTransfers() { |
@@ -141,5 +133,13 @@ base::TimeDelta AsyncPixelTransferDelegateStub::GetTotalTextureUploadTime() { |
return total_texture_upload_time_; |
} |
+bool AsyncPixelTransferDelegateStub::ProcessMorePendingTransfers() { |
+ return false; |
+} |
+ |
+bool AsyncPixelTransferDelegateStub::NeedsProcessMorePendingTransfers() { |
+ return false; |
+} |
+ |
} // namespace gfx |