| 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 a1c7eb260ef4d7da1b9c9185834b41edde9277f6..4eab34b29dca830cbb9debd49617e1b9e0131b5e 100644
|
| --- a/ui/gl/async_pixel_transfer_delegate_android.cc
|
| +++ b/ui/gl/async_pixel_transfer_delegate_android.cc
|
| @@ -372,6 +372,8 @@ class AsyncPixelTransferDelegateAndroid
|
| AsyncPixelTransferState* state) OVERRIDE;
|
| virtual uint32 GetTextureUploadCount() OVERRIDE;
|
| virtual base::TimeDelta GetTotalTextureUploadTime() OVERRIDE;
|
| + virtual void ProcessPendingTransfers() OVERRIDE;
|
| + virtual bool HasPendingTransfers() OVERRIDE;
|
|
|
| private:
|
| // implement AsyncPixelTransferDelegate:
|
| @@ -609,6 +611,13 @@ base::TimeDelta AsyncPixelTransferDelegateAndroid::GetTotalTextureUploadTime() {
|
| return total_texture_upload_time;
|
| }
|
|
|
| +void AsyncPixelTransferDelegateAndroid::ProcessPendingTransfers() {}
|
| +
|
| +bool AsyncPixelTransferDelegateAndroid::HasPendingTransfers() {
|
| + return false;
|
| +}
|
| +
|
| +
|
| namespace {
|
| void SetGlParametersForEglImageTexture() {
|
| // These params are needed for EGLImage creation to succeed on several
|
|
|