commit 73528731b4ce89cd29ab7a646ff7fc1784c137f8
author boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Aug 13 03:05:54 2014 +0000
committer Bo Liu <boliu@google.com> Wed Aug 13 10:59:31 2014 -0700
tree 18dbbe4e45f7aea3670ed1768f6828c530d24e6e
parent 2902654d73e375fea30c8296e96679e69ef4ab9c

Cherry-pick: Enable async upload egl with mailbox synchronizer

Cherry-pick with conflict of chromium crrev.com/r289172

Conflicts:
	gpu/command_buffer/service/async_pixel_transfer_manager_android.cc

BUG: 16550863

Original description:

With the workaround in r286800, mailbox synchronizer skips tile
textures, so is compatible with async transfer egl.

This is a partial revert of r286501.

Change-Id: I0a193f464e0a23ab9b9a9af16770058966b6c587

gpu/command_buffer/service/async_pixel_transfer_manager_android.cc

diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc b/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc
index 673cb54..a2b2255 100644
--- a/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc
+++ b/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc
@@ -10,7 +10,6 @@
 #include "gpu/command_buffer/service/async_pixel_transfer_manager_idle.h"
 #include "gpu/command_buffer/service/async_pixel_transfer_manager_stub.h"
 #include "gpu/command_buffer/service/async_pixel_transfer_manager_sync.h"
-#include "gpu/command_buffer/service/mailbox_synchronizer.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 
@@ -64,8 +63,7 @@
           !IsBroadcom() &&
           !IsImagination() &&
           !IsNvidia31() &&
-          !base::android::SysUtils::IsLowEndDevice() &&
-          !gles2::MailboxSynchronizer::GetInstance()) {
+          !base::android::SysUtils::IsLowEndDevice()) {
         return new AsyncPixelTransferManagerEGL;
       }
       return new AsyncPixelTransferManagerIdle;