Fix extensions string

src/gpu/gl/GrGLExtensions.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gl/GrGLExtensions.h"
 #include "gl/GrGLDefines.h"
 #include "gl/GrGLUtil.h"
@@ skipping 33 matching lines @@
         fStrings.push_back_n(extensionCnt);
         for (int i = 0; i < extensionCnt; ++i) {
             const char* ext = (const char*) getStringi(GR_GL_EXTENSIONS, i);
             fStrings[i] = ext;
         }
     } else {
         const char* extensions = (const char*) getString(GR_GL_EXTENSIONS);
         if (NULL == extensions) {
             return false;
         }
-        // First count the extensions so that we don't cause the array to malloc multiple times.
-        int extensionCnt = 1;
-        const char* e = (const char*) extensions;
-        while (NULL != (e = strchr(e+1, ' '))) {
-            e += 1;
-            ++extensionCnt;
-        }
-        fStrings.push_back_n(extensionCnt);
-
-        int i = 0;
         while (true) {
-            size_t length = strcspn(extensions, " ");
-            GrAssert(i < extensionCnt);
-            fStrings[i].set(extensions, length);
-            ++i;
-            if ('\0' == extensions[length]) {
+            // skip over multiple spaces between extensions
+            while (' ' == *extensions) {
+                ++extensions;
+            }
+            // quit once we reach the end of the string.
+            if ('\0' == *extensions) {
                 break;
             }
-            extensions += length + 1;
+            // we found an extension
+            size_t length = strcspn(extensions, " ");
+            fStrings.push_back().set(extensions, length);
+            extensions += length;
         }
-        GrAssert(i == extensionCnt);
     }
     SkTSearchCompareLTFunctor<SkString, extension_compare> cmp;
     SkTQSort(&fStrings.front(), &fStrings.back(), cmp);
     return true;
 }
 
 bool GrGLExtensions::has(const char* ext) const {
     SkString extensionStr(ext);
     int idx = SkTSearch<SkString, extension_compare>(&fStrings.front(),
                                                      fStrings.count(),
                                                      extensionStr,
                                                      sizeof(SkString));
     return idx >= 0;
 }