Merge to XFA: Fix issues with != and == in fx_basic_wstring

core/include/fxcrt/fx_string.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef _FX_STRING_H_
 #define _FX_STRING_H_
 
 #include <stdint.h>  // For intptr_t.
@@ skipping 493 matching lines @@
 
     CFX_WideStringC& operator = (const CFX_WideStringC& src)
     {
         m_Ptr = src.m_Ptr;
         m_Length = src.m_Length;
         return *this;
     }
 
     CFX_WideStringC& operator = (const CFX_WideString& src);
 
-    bool                        operator == (const CFX_WideStringC& str) const
-    {
-        return  str.m_Length == m_Length && FXSYS_memcmp32(str.m_Ptr, m_Ptr, m_Length * sizeof(FX_WCHAR)) == 0;
+    bool operator== (const wchar_t* ptr) const  {
+        return FXSYS_wcslen(ptr) == m_Length &&
+            wmemcmp(ptr, m_Ptr, m_Length) == 0;
     }
-
-    bool                        operator != (const CFX_WideStringC& str) const
-    {
-        return  str.m_Length != m_Length || FXSYS_memcmp32(str.m_Ptr, m_Ptr, m_Length * sizeof(FX_WCHAR)) != 0;
+    bool operator== (const CFX_WideStringC& str) const  {
+        return str.m_Length == m_Length &&
+            wmemcmp(str.m_Ptr, m_Ptr, m_Length) == 0;
+    }
+    bool operator!= (const wchar_t* ptr) const { return !(*this == ptr); }
+    bool operator!= (const CFX_WideStringC& str) const {
+        return !(*this == str);
     }
 
     FX_LPCWSTR          GetPtr() const
     {
         return m_Ptr;
     }
 
     FX_STRSIZE          GetLength() const
     {
         return m_Length;
@@ skipping 59 matching lines @@
 protected:
     FX_LPCWSTR          m_Ptr;
     FX_STRSIZE          m_Length;
 
 private:
     void*                       operator new (size_t) throw()
     {
         return NULL;
     }
 };
+inline bool operator== (const wchar_t* lhs, const CFX_WideStringC& rhs) {
+    return rhs == lhs;
+}
+inline bool operator!= (const wchar_t* lhs, const CFX_WideStringC& rhs) {
+    return rhs != lhs;
+}
 typedef const CFX_WideStringC&  FX_WSTR;
 #define FX_WSTRC(wstr) CFX_WideStringC(wstr, FX_ArraySize(wstr) - 1)
+
 struct CFX_StringDataW {
     intptr_t    m_nRefs;  // Would prefer ssize_t, but no windows support.
     FX_STRSIZE  m_nDataLength;
     FX_STRSIZE  m_nAllocLength;
     FX_WCHAR    m_String[1];
 };
 
 // A mutable string with shared buffers using copy-on-write semantics that
 // avoids the cost of std::string's iterator stability guarantees.
 class CFX_WideString
@@ skipping 61 matching lines @@
     const CFX_WideString&       operator =(const CFX_WideStringC& stringSrc);
 
     const CFX_WideString&       operator += (FX_LPCWSTR str);
 
     const CFX_WideString&       operator += (FX_WCHAR ch);
 
     const CFX_WideString&       operator += (const CFX_WideString& str);
 
     const CFX_WideString&       operator += (const CFX_WideStringC& str);
 
+    bool operator== (const wchar_t* ptr) const { return Equal(ptr); }
+    bool operator== (const CFX_WideStringC& str) const { return Equal(str); }
+    bool operator== (const CFX_WideString& other) const { return Equal(other); }
+
+    bool operator!= (const wchar_t* ptr) const { return !(*this == ptr); }
+    bool operator!= (const CFX_WideStringC& str) const {
+        return !(*this == str);
+    }
+    bool operator!= (const CFX_WideString& other) const {
+        return !(*this == other);
+    }
+
     bool operator< (const CFX_WideString& str) const {
         int result = wmemcmp(c_str(), str.c_str(), std::min(GetLength(), str.GetLength()));
         return result < 0 || (result == 0 && GetLength() < str.GetLength());
     }
 
     FX_WCHAR                            GetAt(FX_STRSIZE nIndex) const
     {
         return m_pData ? m_pData->m_String[nIndex] : 0;
     }
 
     FX_WCHAR                            operator[](FX_STRSIZE nIndex) const
     {
         return m_pData ? m_pData->m_String[nIndex] : 0;
     }
 
     void                                        SetAt(FX_STRSIZE nIndex, FX_WCHAR ch);
 
     int                                         Compare(FX_LPCWSTR str) const;
 
     int                                         Compare(const CFX_WideString& str) const;
 
     int                                         CompareNoCase(FX_LPCWSTR str) const;
 
-    bool                                        Equal(const CFX_WideStringC& str) const;
+    bool Equal(const wchar_t* ptr) const;
+    bool Equal(const CFX_WideStringC& str) const;
+    bool Equal(const CFX_WideString& other) const;
 
     CFX_WideString                      Mid(FX_STRSIZE first) const;
 
     CFX_WideString                      Mid(FX_STRSIZE first, FX_STRSIZE count) const;
 
     CFX_WideString                      Left(FX_STRSIZE count) const;
 
     CFX_WideString                      Right(FX_STRSIZE count) const;
 
     FX_STRSIZE                          Insert(FX_STRSIZE index, FX_WCHAR ch);
@@ skipping 107 matching lines @@
     return CFX_WideString(str1, str2);
 }
 inline CFX_WideString operator + (const CFX_WideString& str1, const CFX_WideStringC& str2)
 {
     return CFX_WideString(str1, str2);
 }
 inline CFX_WideString operator + (const CFX_WideStringC& str1, const CFX_WideString& str2)
 {
     return CFX_WideString(str1, str2);
 }
-
-bool operator==(const CFX_WideString& s1, const CFX_WideString& s2);
-bool operator==(const CFX_WideString& s1, const CFX_WideStringC& s2);
-bool operator==(const CFX_WideStringC& s1, const CFX_WideString& s2);
-bool operator== (const CFX_WideString& s1, FX_LPCWSTR s2);
-bool operator==(FX_LPCWSTR s1, const CFX_WideString& s2);
-bool operator!=(const CFX_WideString& s1, const CFX_WideString& s2);
-bool operator!=(const CFX_WideString& s1, const CFX_WideStringC& s2);
-bool operator!=(const CFX_WideStringC& s1, const CFX_WideString& s2);
-bool operator!= (const CFX_WideString& s1, FX_LPCWSTR s2);
-bool operator!=(FX_LPCWSTR s1, const CFX_WideString& s2);
+inline bool operator== (const wchar_t* lhs, const CFX_WideString& rhs) {
+    return rhs == lhs;
+}
+inline bool operator== (const CFX_WideStringC& lhs, const CFX_WideString& rhs) {
+    return rhs == lhs;
+}
+inline bool operator!= (const wchar_t* lhs, const CFX_WideString& rhs) {
+    return rhs != lhs;
+}
+inline bool operator!= (const CFX_WideStringC& lhs, const CFX_WideString& rhs) {
+    return rhs != lhs;
+}
 FX_FLOAT FX_atof(FX_BSTR str);
 void FX_atonum(FX_BSTR str, FX_BOOL& bInteger, void* pData);
 FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_LPSTR buf);
 CFX_ByteString  FX_UTF8Encode(FX_LPCWSTR pwsStr, FX_STRSIZE len);
 inline CFX_ByteString   FX_UTF8Encode(FX_WSTR wsStr)
 {
     return FX_UTF8Encode(wsStr.GetPtr(), wsStr.GetLength());
 }
 inline CFX_ByteString   FX_UTF8Encode(const CFX_WideString &wsStr)
 {
     return FX_UTF8Encode(wsStr.c_str(), wsStr.GetLength());
 }
 #endif