| Index: Source/wtf/text/WTFString.h
|
| diff --git a/Source/wtf/text/WTFString.h b/Source/wtf/text/WTFString.h
|
| index cecae95eb3987ea84403c8b985dc8a74ea3382d7..1ef9f8793a57a234f91c60ee8928f9cdf2391641 100644
|
| --- a/Source/wtf/text/WTFString.h
|
| +++ b/Source/wtf/text/WTFString.h
|
| @@ -278,7 +278,7 @@ public:
|
| void prependTo(Vector<UChar, inlineCapacity>&, unsigned pos = 0, unsigned len = UINT_MAX) const;
|
|
|
| UChar32 characterStartingAt(unsigned) const;
|
| -
|
| +
|
| bool contains(UChar c) const { return find(c) != notFound; }
|
| bool contains(const LChar* str, bool caseSensitive = true) const { return find(str, 0, caseSensitive) != notFound; }
|
| bool contains(const String& str, bool caseSensitive = true) const { return find(str, 0, caseSensitive) != notFound; }
|
| @@ -410,8 +410,8 @@ public:
|
|
|
| #ifdef __OBJC__
|
| String(NSString*);
|
| -
|
| - // This conversion maps NULL to "", which loses the meaning of NULL, but we
|
| +
|
| + // This conversion maps NULL to "", which loses the meaning of NULL, but we
|
| // need this mapping because AppKit crashes when passed nil NSStrings.
|
| operator NSString*() const { if (!m_impl) return @""; return *m_impl; }
|
| #endif
|
| @@ -436,7 +436,7 @@ public:
|
| // Tries to convert the passed in string to UTF-8, but will fall back to Latin-1 if the string is not valid UTF-8.
|
| static String fromUTF8WithLatin1Fallback(const LChar*, size_t);
|
| static String fromUTF8WithLatin1Fallback(const char* s, size_t length) { return fromUTF8WithLatin1Fallback(reinterpret_cast<const LChar*>(s), length); };
|
| -
|
| +
|
| // Determines the writing direction using the Unicode Bidi Algorithm rules P2 and P3.
|
| WTF::Unicode::Direction defaultWritingDirection(bool* hasStrongDirectionality = 0) const
|
| {
|
| @@ -504,7 +504,7 @@ 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 equalPossiblyIgnoringCase(const String& a, const String& b, bool ignoreCase)
|
| +inline bool equalPossiblyIgnoringCase(const String& a, const String& b, bool ignoreCase)
|
| {
|
| return ignoreCase ? equalIgnoringCase(a, b) : (a == b);
|
| }
|
|
|