Update from https://crrev.com/306655

gpu/command_buffer/common/gles2_cmd_utils.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.
 
 // This file is here so other GLES2 related files can have a common set of
 // includes where appropriate.
 
 #include <sstream>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
+#include <GLES3/gl3.h>
 
+#include "base/numerics/safe_math.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 
 namespace gpu {
 namespace gles2 {
 
 namespace gl_error_bit {
 enum GLErrorBit {
   kNoError = 0,
   kInvalidEnum = (1 << 0),
@@ skipping 330 matching lines @@
        return 1;
     default:
        break;
     }
 
     switch (format) {
     case GL_RGB:
     case GL_SRGB_EXT:
        return 3;
     case GL_LUMINANCE_ALPHA:
+    case GL_RG_EXT:
        return 2;
     case GL_RGBA:
     case GL_BGRA_EXT:
     case GL_SRGB_ALPHA_EXT:
        return 4;
     case GL_ALPHA:
     case GL_LUMINANCE:
     case GL_DEPTH_COMPONENT:
     case GL_DEPTH_COMPONENT24_OES:
     case GL_DEPTH_COMPONENT32_OES:
     case GL_DEPTH_COMPONENT16:
     case GL_DEPTH24_STENCIL8_OES:
     case GL_DEPTH_STENCIL_OES:
+    case GL_RED_EXT:
        return 1;
     default:
        return 0;
   }
 }
 
 // Return the number of bytes per element, based on the element type.
 int BytesPerElement(int type) {
   switch (type) {
     case GL_FLOAT:
@@ skipping 311 matching lines @@
     case GL_DEPTH_COMPONENT32_OES:
     case GL_DEPTH_COMPONENT24_OES:
     case GL_DEPTH_COMPONENT16:
     case GL_DEPTH_COMPONENT:
       return kDepth;
     case GL_STENCIL_INDEX8:
       return kStencil;
     case GL_DEPTH_STENCIL_OES:
     case GL_DEPTH24_STENCIL8_OES:
       return kDepth | kStencil;
+    case GL_RED_EXT:
+      return kRed;
+    case GL_RG_EXT:
+      return kRed | kGreen;
     default:
       return 0x0000;
   }
 }
 
 uint32 GLES2Util::GetChannelsNeededForAttachmentType(
     int type, uint32 max_color_attachments) {
   switch (type) {
     case GL_DEPTH_ATTACHMENT:
       return kDepth;
@@ skipping 46 matching lines @@
   return GetStringEnum(value);
 }
 
 bool GLES2Util::ParseUniformName(
     const std::string& name,
     size_t* array_pos,
     int* element_index,
     bool* getting_array) {
   bool getting_array_location = false;
   size_t open_pos = std::string::npos;
-  int index = 0;
+  base::CheckedNumeric<int> index = 0;
   if (name[name.size() - 1] == ']') {
     if (name.size() < 3) {
       return false;
     }
     open_pos = name.find_last_of('[');
     if (open_pos == std::string::npos ||
         open_pos >= name.size() - 2) {
       return false;
     }
     size_t last = name.size() - 1;
     for (size_t pos = open_pos + 1; pos < last; ++pos) {
       int8 digit = name[pos] - '0';
       if (digit < 0 || digit > 9) {
         return false;
       }
       index = index * 10 + digit;
     }
+    if (!index.IsValid()) {
+      return false;
+    }
     getting_array_location = true;
   }
   *getting_array = getting_array_location;
-  *element_index = index;
+  *element_index = index.ValueOrDie();
   *array_pos = open_pos;
   return true;
 }
 
 namespace {
 
 // WebGraphicsContext3DCommandBufferImpl configuration attributes. Those in
 // the 16-bit range are the same as used by EGL. Those outside the 16-bit range
 // are unique to Chromium. Attributes are matched using a closest fit algorithm.
 
@@ skipping 137 matching lines @@
   }
 
   return true;
 }
 
 #include "gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu