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

gpu/command_buffer/service/mailbox_manager_sync.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/mailbox_manager_sync.h"
 
 #include <algorithm>
 #include <queue>
 
 #include "base/memory/linked_ptr.h"
@@ skipping 255 matching lines @@
 }
 
 void MailboxManagerSync::UpdateDefinitionLocked(
     Texture* texture,
     TextureGroupRef* group_ref) {
   g_lock.Get().AssertAcquired();
 
   if (SkipTextureWorkarounds(texture))
     return;
 
-  gfx::GLImage* image = texture->GetLevelImage(texture->target(), 0);
+  gfx::GLImage* gl_image = texture->GetLevelImage(texture->target(), 0);
   TextureGroup* group = group_ref->group.get();
   const TextureDefinition& definition = group->GetDefinition();
   scoped_refptr<NativeImageBuffer> image_buffer = definition.image();
 
   // Make sure we don't clobber with an older version
   if (!definition.IsOlderThan(group_ref->version))
     return;
 
   // Also don't push redundant updates. Note that it would break the
   // versioning.
   if (definition.Matches(texture))
     return;
 
-  DCHECK_IMPLIES(image, image_buffer.get());
-  if (image && !image_buffer->IsClient(image)) {
+  DCHECK_IMPLIES(gl_image, image_buffer.get());
+  if (gl_image && !image_buffer->IsClient(gl_image)) {
     LOG(ERROR) << "MailboxSync: Incompatible attachment";
     return;
   }
 
   group->SetDefinition(TextureDefinition(texture, ++group_ref->version,
-                                         image ? image_buffer : NULL));
+                                         gl_image ? image_buffer : NULL));
 }
 
 void MailboxManagerSync::PushTextureUpdates(const SyncToken& token) {
   base::AutoLock lock(g_lock.Get());
 
   for (TextureToGroupMap::iterator it = texture_to_group_.begin();
        it != texture_to_group_.end(); it++) {
     UpdateDefinitionLocked(it->first, &it->second);
   }
   CreateFenceLocked(token);
@@ skipping 21 matching lines @@
 
   if (!needs_update.empty()) {
     for (const TextureUpdatePair& pair : needs_update) {
       pair.second.UpdateTexture(pair.first);
     }
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu