Revert of Templatize SkToXXX.

include/core/SkString.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkString_DEFINED
@@ skipping 18 matching lines @@
 }
 
 bool SkStrEndsWith(const char string[], const char suffixStr[]);
 bool SkStrEndsWith(const char string[], const char suffixChar);
 
 int SkStrStartsWithOneOf(const char string[], const char prefixes[]);
 
 static int SkStrFind(const char string[], const char substring[]) {
     const char *first = strstr(string, substring);
     if (NULL == first) return -1;
-    return SkToInt(first - &string[0]);
+    return SkToS32(first - &string[0]);
 }
 
 static int SkStrFindLastOf(const char string[], const char subchar) {
     const char* last = strrchr(string, subchar);
     if (NULL == last) return -1;
-    return SkToInt(last - &string[0]);
+    return SkToS32(last - &string[0]);
 }
 
 static bool SkStrContains(const char string[], const char substring[]) {
     SkASSERT(string);
     SkASSERT(substring);
     return (-1 != SkStrFind(string, substring));
 }
 static bool SkStrContains(const char string[], const char subchar) {
     SkASSERT(string);
     char tmp[2];
@@ skipping 225 matching lines @@
 };
 
 // Split str on any characters in delimiters into out.  (Think, strtok with a sane API.)
 void SkStrSplit(const char* str, const char* delimiters, SkStrSplitMode splitMode,
                 SkTArray<SkString>* out);
 inline void SkStrSplit(const char* str, const char* delimiters, SkTArray<SkString>* out) {
     SkStrSplit(str, delimiters, kCoalesce_SkStrSplitMode, out);
 }
 
 #endif