Pass CFX_*StringCs to FX_HashCode_GETA and _GETW hash functions.

Too many calls were of the form fn(x.c_str(), x.GetLength())
which is an anti-pattern given the StringC classes which tie
these together.

There are a few places where explicit CFX_*StringCs are
constructed, but this can be avoided by changing the args
to these functions in the same manner.

Removed String_ from name of functions since it added
little value. Also removed default argument.

Review URL: https://codereview.chromium.org/1919563002

1 files changed, 8 insertions, 11 deletions

diff --git a/xfa/fxfa/fm2js/xfa_lexer.cpp b/xfa/fxfa/fm2js/xfa_lexer.cpp
index 4462bd5154..dd3b48ff54 100644
--- a/xfa/fxfa/fm2js/xfa_lexer.cpp
+++ b/xfa/fxfa/fm2js/xfa_lexer.cpp
@@ -516,21 +516,18 @@ void CXFA_FMLexer::Comment(const FX_WCHAR* p, const FX_WCHAR*& pEnd) {
 }
 
 XFA_FM_TOKEN CXFA_FMLexer::IsKeyword(const CFX_WideStringC& str) {
-  int32_t iLength = str.GetLength();
-  uint32_t uHash = FX_HashCode_String_GetW(str.c_str(), iLength, TRUE);
-  int32_t iStart = KEYWORD_START, iEnd = KEYWORD_END;
-  int32_t iMid = (iStart + iEnd) / 2;
-  XFA_FMKeyword keyword;
+  uint32_t uHash = FX_HashCode_GetW(str, true);
+  int32_t iStart = KEYWORD_START;
+  int32_t iEnd = KEYWORD_END;
   do {
-    iMid = (iStart + iEnd) / 2;
-    keyword = keyWords[iMid];
-    if (uHash == keyword.m_uHash) {
+    int32_t iMid = (iStart + iEnd) / 2;
+    XFA_FMKeyword keyword = keyWords[iMid];
+    if (uHash == keyword.m_uHash)
       return keyword.m_type;
-    } else if (uHash < keyword.m_uHash) {
+    if (uHash < keyword.m_uHash)
       iEnd = iMid - 1;
-    } else {
+    else
       iStart = iMid + 1;
-    }
   } while (iStart <= iEnd);
   return TOKidentifier;
 }