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, 6 insertions, 13 deletions

diff --git a/xfa/fde/css/fde_csscache.cpp b/xfa/fde/css/fde_csscache.cpp
index e23b4c6377..9a259e1844 100644
--- a/xfa/fde/css/fde_csscache.cpp
+++ b/xfa/fde/css/fde_csscache.cpp
@@ -29,26 +29,19 @@ FDE_CSSTagCache::FDE_CSSTagCache(FDE_CSSTagCache* parent,
       dwTagHash(0),
       iClassIndex(0),
       dwClassHashs(1) {
-  static const uint32_t s_dwIDHash = FX_HashCode_String_GetW(L"id", 2, TRUE);
-  static const uint32_t s_dwClassHash =
-      FX_HashCode_String_GetW(L"class", 5, TRUE);
-
-  CFX_WideString wsTag = pTag->GetTagName();
-  dwTagHash = FX_HashCode_String_GetW(wsTag.c_str(), wsTag.GetLength(), TRUE);
+  static const uint32_t s_dwIDHash = FX_HashCode_GetW(L"id", true);
+  static const uint32_t s_dwClassHash = FX_HashCode_GetW(L"class", true);
+  dwTagHash = FX_HashCode_GetW(pTag->GetTagName().AsStringC(), true);
 
   for (auto it : *pTag) {
     CFX_WideString wsValue = it.first;
     CFX_WideString wsName = it.second;
-
-    uint32_t dwNameHash =
-        FX_HashCode_String_GetW(wsName.c_str(), wsName.GetLength(), TRUE);
-
+    uint32_t dwNameHash = FX_HashCode_GetW(wsName.AsStringC(), true);
     if (dwNameHash == s_dwClassHash) {
-      uint32_t dwHash =
-          FX_HashCode_String_GetW(wsValue.c_str(), wsValue.GetLength());
+      uint32_t dwHash = FX_HashCode_GetW(wsValue.AsStringC(), false);
       dwClassHashs.Add(dwHash);
     } else if (dwNameHash == s_dwIDHash) {
-      dwIDHash = FX_HashCode_String_GetW(wsValue.c_str(), wsValue.GetLength());
+      dwIDHash = FX_HashCode_GetW(wsValue.AsStringC(), false);
     }
   }
 }