Index: ui/gl/async_pixel_transfer_delegate_android.cc |
diff --git a/ui/gl/async_pixel_transfer_delegate_android.cc b/ui/gl/async_pixel_transfer_delegate_android.cc |
index 6a3463950adc74b66cc79ff6769a273be22c48f8..f68f650efd7692d2a06d6e167608d2d2049031a4 100644 |
--- a/ui/gl/async_pixel_transfer_delegate_android.cc |
+++ b/ui/gl/async_pixel_transfer_delegate_android.cc |
@@ -212,7 +212,6 @@ class TransferStateInternal |
// We can only change the active texture and unit 0, |
// as that is all that will be restored. |
- glActiveTexture(GL_TEXTURE0); |
glBindTexture(GL_TEXTURE_2D, texture_id_); |
glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, egl_image_); |
bind_callback_.Run(); |
@@ -384,6 +383,8 @@ class AsyncPixelTransferDelegateAndroid |
AsyncPixelTransferState* state) OVERRIDE; |
virtual uint32 GetTextureUploadCount() OVERRIDE; |
virtual base::TimeDelta GetTotalTextureUploadTime() OVERRIDE; |
+ virtual bool ProcessMorePendingTransfers() OVERRIDE; |
+ virtual bool NeedsProcessMorePendingTransfers() OVERRIDE; |
private: |
// implement AsyncPixelTransferDelegate: |
@@ -658,6 +659,15 @@ base::TimeDelta AsyncPixelTransferDelegateAndroid::GetTotalTextureUploadTime() { |
return total_texture_upload_time; |
} |
+bool AsyncPixelTransferDelegateAndroid::ProcessMorePendingTransfers() { |
+ return false; |
+} |
+ |
+bool AsyncPixelTransferDelegateAndroid::NeedsProcessMorePendingTransfers() { |
+ return false; |
+} |
+ |
+ |
namespace { |
void SetGlParametersForEglImageTexture() { |
// These params are needed for EGLImage creation to succeed on several |