Re-land: ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder.

gpu/command_buffer/service/mailbox_manager_sync.cc

Index: gpu/command_buffer/service/mailbox_manager_sync.cc
diff --git a/gpu/command_buffer/service/mailbox_manager_sync.cc b/gpu/command_buffer/service/mailbox_manager_sync.cc
index 7463f92bfdc78435ed2e7de8986c56522cc8b6a6..a48d032e6e2a28b18334ee6f2445c63cde509f12 100644
--- a/gpu/command_buffer/service/mailbox_manager_sync.cc
+++ b/gpu/command_buffer/service/mailbox_manager_sync.cc
@@ -273,7 +273,7 @@ void MailboxManagerSync::UpdateDefinitionLocked(
   if (SkipTextureWorkarounds(texture))
     return;
 
-  gfx::GLImage* gl_image = texture->GetLevelImage(texture->target(), 0);
+  gfx::GLImage* image = texture->GetLevelImage(texture->target(), 0);
   TextureGroup* group = group_ref->group.get();
   const TextureDefinition& definition = group->GetDefinition();
   scoped_refptr<NativeImageBuffer> image_buffer = definition.image();
@@ -287,14 +287,14 @@ void MailboxManagerSync::UpdateDefinitionLocked(
   if (definition.Matches(texture))
     return;
 
-  DCHECK_IMPLIES(gl_image, image_buffer.get());
-  if (gl_image && !image_buffer->IsClient(gl_image)) {
+  DCHECK_IMPLIES(image, image_buffer.get());
+  if (image && !image_buffer->IsClient(image)) {
     LOG(ERROR) << "MailboxSync: Incompatible attachment";
     return;
   }
 
   group->SetDefinition(TextureDefinition(texture, ++group_ref->version,
-                                         gl_image ? image_buffer : NULL));
+                                         image ? image_buffer : NULL));
 }
 
 void MailboxManagerSync::PushTextureUpdates(const SyncToken& token) {