Fix overflow issue when generateMipmap for srgb texture

gpu/command_buffer/service/gles2_cmd_srgb_converter.cc

 // Copyright (c) 2016 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/gles2_cmd_srgb_converter.h"
 
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "ui/gl/gl_version_info.h"
 
 namespace {
@@ skipping 406 matching lines @@
   tex->GetLevelType(target, base_level, &type, &internal_format);
   format = TextureManager::ExtractFormatFromStorageFormat(internal_format);
   GLint mipmap_levels;
   if (tex->IsImmutable()) {
     mipmap_levels = tex->GetImmutableLevels();
   } else {
     mipmap_levels =
         TextureManager::ComputeMipMapCount(target, width, height, depth);
   }
   const GLint max_mipmap_available_levels =
-      (base_level + mipmap_levels) > max_level ? max_level
-                                               : (base_level + mipmap_levels);
+      (base_level + mipmap_levels - 1) > max_level

[yunchao, 2017/05/05 08:01:48]

Please check that max_level, not max_level - 1?

[yizhou.jiang, 2017/05/08 08:28:56]

The variable name is quite confusing, so I change variable name
max_mipmap_available_levels to max_mipmap_available_level. 

+          ? max_level
+          : (base_level + mipmap_levels - 1);
 
   glBindTexture(GL_TEXTURE_2D, srgb_converter_textures_[1]);
   if (feature_info_->ext_color_buffer_float_available() &&
       feature_info_->oes_texture_float_linear_available()) {
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, width, height, 0, GL_RGBA,
                  GL_FLOAT, nullptr);
   } else {
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA,
                  GL_UNSIGNED_BYTE, nullptr);
   }
@@ skipping 27 matching lines @@
   glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER, srgb_encoder_fbo_);
   glBindTexture(GL_TEXTURE_2D, srgb_converter_textures_[1]);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
                   GL_NEAREST_MIPMAP_NEAREST);
 
   width = (width == 1) ? 1 : width >> 1;
   height = (height == 1) ? 1 : height >> 1;
 
   // TODO(yizhou): An optimization. Attach 1 level at a time, once for every
   // iteration of the loop.
-  for (GLint level = base_level + 1; level < max_mipmap_available_levels;
+  for (GLint level = base_level + 1; level <= max_mipmap_available_levels;

[yunchao, 2017/05/05 08:01:48]

I think it is <=, instead of <.

[yizhou.jiang, 2017/05/08 08:28:56]

Done.

        ++level) {
     // copy mipmaps level by level from srgb_converter_textures_[1] to tex
     // generate mipmap for tex manually
     glBindTexture(GL_TEXTURE_2D, tex->service_id());
     if (!tex->IsImmutable()) {
       glTexImage2D(GL_TEXTURE_2D, level, internal_format, width, height, 0,
                    format, type, nullptr);
     }
     glFramebufferTexture2DEXT(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
                               GL_TEXTURE_2D, tex->service_id(), level);
@@ skipping 11 matching lines @@
   decoder->RestoreActiveTexture();
   decoder->RestoreProgramBindings();
   decoder->RestoreBufferBindings();
   decoder->RestoreFramebufferBindings();
   decoder->RestoreGlobalState();
   decoder->RestoreTextureState(tex->service_id());
 }
 
 }  // namespace gles2.
 }  // namespace gpu