| Index: third_party/WebKit/Source/wtf/text/WTFString.h
|
| diff --git a/third_party/WebKit/Source/wtf/text/WTFString.h b/third_party/WebKit/Source/wtf/text/WTFString.h
|
| index 4950c1d7c8381917b4456f84e5dd7c76c3bc7185..54e58a661e950db83962096bebac6a3dbc73dffc 100644
|
| --- a/third_party/WebKit/Source/wtf/text/WTFString.h
|
| +++ b/third_party/WebKit/Source/wtf/text/WTFString.h
|
| @@ -232,21 +232,15 @@ public:
|
| bool contains(const LChar* str, TextCaseSensitivity caseSensitivity = TextCaseSensitive) const { return find(str, 0, caseSensitivity) != kNotFound; }
|
| bool contains(const String& str, TextCaseSensitivity caseSensitivity = TextCaseSensitive) const { return find(str, 0, caseSensitivity) != kNotFound; }
|
|
|
| - bool startsWith(const String& s, TextCaseSensitivity caseSensitivity = TextCaseSensitive) const
|
| - { return m_impl ? DISPATCH_CASE_OP(caseSensitivity, m_impl->startsWith, (s.impl())) : s.isEmpty(); }
|
| + bool startsWith(const StringView& prefix, TextCaseSensitivity caseSensitivity = TextCaseSensitive) const
|
| + { return m_impl ? DISPATCH_CASE_OP(caseSensitivity, m_impl->startsWith, (prefix)) : prefix.isEmpty(); }
|
| bool startsWith(UChar character) const
|
| { return m_impl ? m_impl->startsWith(character) : false; }
|
| - template<unsigned matchLength>
|
| - bool startsWith(const char (&prefix)[matchLength], TextCaseSensitivity caseSensitivity = TextCaseSensitive) const
|
| - { return m_impl ? DISPATCH_CASE_OP(caseSensitivity, m_impl->startsWith, (prefix, matchLength - 1)) : !matchLength; }
|
|
|
| - bool endsWith(const String& s, TextCaseSensitivity caseSensitivity = TextCaseSensitive) const
|
| - { return m_impl ? DISPATCH_CASE_OP(caseSensitivity, m_impl->endsWith, (s.impl())) : s.isEmpty(); }
|
| + bool endsWith(const StringView& suffix, TextCaseSensitivity caseSensitivity = TextCaseSensitive) const
|
| + { return m_impl ? DISPATCH_CASE_OP(caseSensitivity, m_impl->endsWith, (suffix)) : suffix.isEmpty(); }
|
| bool endsWith(UChar character) const
|
| { return m_impl ? m_impl->endsWith(character) : false; }
|
| - template<unsigned matchLength>
|
| - bool endsWith(const char (&prefix)[matchLength], TextCaseSensitivity caseSensitivity = TextCaseSensitive) const
|
| - { return m_impl ? DISPATCH_CASE_OP(caseSensitivity, m_impl->endsWith, (prefix, matchLength - 1)) : !matchLength; }
|
|
|
| void append(const String&);
|
| void append(LChar);
|
| @@ -455,10 +449,6 @@ inline bool equalIgnoringCase(const String& a, const char* b) { return equalIgno
|
| inline bool equalIgnoringCase(const LChar* a, const String& b) { return equalIgnoringCase(a, b.impl()); }
|
| inline bool equalIgnoringCase(const char* a, const String& b) { return equalIgnoringCase(reinterpret_cast<const LChar*>(a), b.impl()); }
|
|
|
| -inline bool equalIgnoringASCIICase(const String& a, const String& b) { return equalIgnoringASCIICase(a.impl(), b.impl()); }
|
| -inline bool equalIgnoringASCIICase(const String& a, const LChar* b) { return equalIgnoringASCIICase(a.impl(), b); }
|
| -inline bool equalIgnoringASCIICase(const String& a, const char* b) { return equalIgnoringASCIICase(a.impl(), b); }
|
| -
|
| inline bool equalPossiblyIgnoringCase(const String& a, const String& b, bool ignoreCase)
|
| {
|
| return ignoreCase ? equalIgnoringCase(a, b) : (a == b);
|
|
|