Merge 152707 - Fix Uniform Name Parsing

gpu/command_buffer/client/program_info_manager.cc

Index: gpu/command_buffer/client/program_info_manager.cc
===================================================================
--- gpu/command_buffer/client/program_info_manager.cc	(revision 153741)
+++ gpu/command_buffer/client/program_info_manager.cc	(working copy)
@@ -5,6 +5,7 @@
 #include "../client/program_info_manager.h"
 #include "../client/atomicops.h"
 #include "../client/gles2_implementation.h"
+#include "../common/gles2_cmd_utils.h"
 
 #include <map>
 
@@ -226,35 +227,27 @@
   return -1;
 }
 
-// TODO(gman): Add a faster lookup.
 GLint CachedProgramInfoManager::ProgramInfo::GetUniformLocation(
     const std::string& name) const {
+  bool getting_array_location = false;
+  size_t open_pos = std::string::npos;
+  int index = 0;
+  if (!GLES2Util::ParseUniformName(
+      name, &open_pos, &index, &getting_array_location)) {
+    return -1;
+  }
   for (GLuint ii = 0; ii < uniform_infos_.size(); ++ii) {
     const UniformInfo& info = uniform_infos_[ii];
     if (info.name == name ||
         (info.is_array &&
          info.name.compare(0, info.name.size() - 3, name) == 0)) {
       return info.element_locations[0];
-    } else if (info.is_array &&
-               name.size() >= 3 && name[name.size() - 1] == ']') {
+    } else if (getting_array_location && info.is_array) {
       // Look for an array specification.
-      size_t open_pos = name.find_last_of('[');
-      if (open_pos != std::string::npos &&
-          open_pos < name.size() - 2 &&
-          info.name.size() > open_pos &&
+      size_t open_pos_2 = info.name.find_last_of('[');
+      if (open_pos_2 == open_pos &&
           name.compare(0, open_pos, info.name, 0, open_pos) == 0) {
-        GLint index = 0;
-        size_t last = name.size() - 1;
-        bool bad = false;
-        for (size_t pos = open_pos + 1; pos < last; ++pos) {
-          int8 digit = name[pos] - '0';
-          if (digit < 0 || digit > 9) {
-            bad = true;
-            break;
-          }
-          index = index * 10 + digit;
-        }
-        if (!bad && index >= 0 && index < info.size) {
+        if (index >= 0 && index < info.size) {
           return info.element_locations[index];
         }
       }