| Index: include/core/SkString.h | 
| diff --git a/include/core/SkString.h b/include/core/SkString.h | 
| index 42466af80bfc9191d4bc960423238892f6cec79f..1c3ee3a20c22979e7409eab9f4ab5b337e6e7155 100644 | 
| --- a/include/core/SkString.h | 
| +++ b/include/core/SkString.h | 
| @@ -36,13 +36,13 @@ 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 SkToS32(first - &string[0]); | 
| +    return SkToInt(first - &string[0]); | 
| } | 
|  | 
| static int SkStrFindLastOf(const char string[], const char subchar) { | 
| const char* last = strrchr(string, subchar); | 
| if (NULL == last) return -1; | 
| -    return SkToS32(last - &string[0]); | 
| +    return SkToInt(last - &string[0]); | 
| } | 
|  | 
| static bool SkStrContains(const char string[], const char substring[]) { | 
|  |