| Index: third_party/WebKit/Source/wtf/text/StringImpl.h
|
| diff --git a/third_party/WebKit/Source/wtf/text/StringImpl.h b/third_party/WebKit/Source/wtf/text/StringImpl.h
|
| index 850c54ab74e45d896dffa4e3b8c38464a6ebee9e..161fa19be061c9ad496f7190c45a2f565eda7fc0 100644
|
| --- a/third_party/WebKit/Source/wtf/text/StringImpl.h
|
| +++ b/third_party/WebKit/Source/wtf/text/StringImpl.h
|
| @@ -31,7 +31,6 @@
|
| #include "wtf/WTFExport.h"
|
| #include "wtf/text/Unicode.h"
|
| #include <limits.h>
|
| -#include <string.h>
|
|
|
| #if OS(MACOSX)
|
| typedef const struct __CFString * CFStringRef;
|
| @@ -519,14 +518,8 @@
|
|
|
| WTF_EXPORT int codePointCompareIgnoringASCIICase(const StringImpl*, const LChar*);
|
|
|
| -inline size_t find(const LChar* characters, unsigned length, LChar matchCharacter, unsigned index = 0)
|
| -{
|
| - const LChar* found = static_cast<const LChar*>(
|
| - memchr(characters + index, matchCharacter, length - index));
|
| - return found ? found - characters : kNotFound;
|
| -}
|
| -
|
| -inline size_t find(const UChar* characters, unsigned length, UChar matchCharacter, unsigned index = 0)
|
| +template<typename CharacterType>
|
| +inline size_t find(const CharacterType* characters, unsigned length, CharacterType matchCharacter, unsigned index = 0)
|
| {
|
| while (index < length) {
|
| if (characters[index] == matchCharacter)
|
| @@ -545,12 +538,6 @@
|
| {
|
| if (matchCharacter & ~0xFF)
|
| return kNotFound;
|
| - return find(characters, length, static_cast<LChar>(matchCharacter), index);
|
| -}
|
| -
|
| -template <typename CharacterType>
|
| -inline size_t find(const CharacterType* characters, unsigned length, char matchCharacter, unsigned index = 0)
|
| -{
|
| return find(characters, length, static_cast<LChar>(matchCharacter), index);
|
| }
|
|
|
|
|