Backport to R19 of r132638 r133017 r133579 r133732

gpu/command_buffer/client/gles2_implementation.cc

 // Copyright (c) 2012 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.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "../client/gles2_implementation.h"
 
 #include <map>
 #include <set>
@@ skipping 2448 matching lines @@
 void GLES2Implementation::DeleteTexturesHelper(
     GLsizei n, const GLuint* textures) {
   if (!id_handlers_[id_namespaces::kTextures]->FreeIds(n, textures)) {
     SetGLError(
         GL_INVALID_VALUE,
         "glDeleteTextures: id not created by this context.");
     return;
   }
   for (GLsizei ii = 0; ii < n; ++ii) {
     for (GLint tt = 0; tt < gl_state_.max_combined_texture_image_units; ++tt) {
-      TextureUnit& unit = texture_units_[active_texture_unit_];
+      TextureUnit& unit = texture_units_[tt];
       if (textures[ii] == unit.bound_texture_2d) {
         unit.bound_texture_2d = 0;
       }
       if (textures[ii] == unit.bound_texture_cube_map) {
         unit.bound_texture_cube_map = 0;
       }
     }
   }
   helper_->DeleteTexturesImmediate(n, textures);
 }
@@ skipping 774 matching lines @@
     helper_->BindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
   }
 #else
   helper_->DrawElementsInstancedANGLE(
       mode, count, type, ToGLuint(indices), primcount);
 #endif
 }
 
 }  // namespace gles2
 }  // namespace gpu