Pass CFX_*StringCs to FX_HashCode_GETA and _GETW hash functions.

xfa/fde/css/fde_cssdeclaration.cpp

 // 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
 
 #include "xfa/fde/css/fde_cssdeclaration.h"
 
 #include "core/fxcrt/include/fx_ext.h"
 #include "xfa/fgas/crt/fgas_system.h"
@@ skipping 39 matching lines @@
 }
 const FX_WCHAR* CFDE_CSSDeclaration::CopyToLocal(
     const FDE_CSSPROPERTYARGS* pArgs,
     const FX_WCHAR* pszValue,
     int32_t iValueLen) {
   FXSYS_assert(iValueLen > 0);
   CFX_MapPtrToPtr* pCache = pArgs->pStringCache;
   void* pKey = NULL;
   if (pCache) {
     void* pszCached = NULL;
-    pKey =
-        (void*)(uintptr_t)FX_HashCode_String_GetW(pszValue, iValueLen, FALSE);
+    pKey = (void*)(uintptr_t)FX_HashCode_GetW(
+        CFX_WideStringC(pszValue, iValueLen), false);
     if (pCache->Lookup(pKey, pszCached)) {
       return (const FX_WCHAR*)pszCached;
     }
   }
   FX_WCHAR* psz =
       (FX_WCHAR*)pArgs->pStaticStore->Alloc((iValueLen + 1) * sizeof(FX_WCHAR));
   if (psz == NULL) {
     return NULL;
   }
   FXSYS_wcsncpy(psz, pszValue, iValueLen);
@@ skipping 219 matching lines @@
   FDE_CSSPRIMITIVETYPE eUnit;
   if (!FDE_ParseCSSNumber(pszValue, iValueLen, fValue, eUnit)) {
     return NULL;
   }
   return NewNumberValue(pArgs->pStaticStore, eUnit, fValue);
 }
 IFDE_CSSValue* CFDE_CSSDeclaration::ParseEnum(const FDE_CSSPROPERTYARGS* pArgs,
                                               const FX_WCHAR* pszValue,
                                               int32_t iValueLen) {
   const FDE_CSSPROPERTYVALUETABLE* pValue =
-      FDE_GetCSSPropertyValueByName(pszValue, iValueLen);
+      FDE_GetCSSPropertyValueByName(CFX_WideStringC(pszValue, iValueLen));
   return pValue ? NewEnumValue(pArgs->pStaticStore, pValue->eName) : NULL;
 }
 IFDE_CSSValue* CFDE_CSSDeclaration::ParseColor(const FDE_CSSPROPERTYARGS* pArgs,
                                                const FX_WCHAR* pszValue,
                                                int32_t iValueLen) {
   FX_ARGB dwColor;
   if (!FDE_ParseCSSColor(pszValue, iValueLen, dwColor)) {
     return NULL;
   }
   return FXTARGET_NewWith(pArgs->pStaticStore) CFDE_CSSPrimitiveValue(dwColor);
@@ skipping 52 matching lines @@
   const FX_WCHAR* pszFuncName = CopyToLocal(pArgs, pszValue, iStartBracket);
   pszValue += (iStartBracket + 1);
   iValueLen -= (iStartBracket + 2);
   CFDE_CSSValueArray argumentArr;
   CFDE_CSSValueListParser parser(pszValue, iValueLen, ',');
   FDE_CSSPRIMITIVETYPE ePrimitiveType;
   while (parser.NextValue(ePrimitiveType, pszValue, iValueLen)) {
     switch (ePrimitiveType) {
       case FDE_CSSPRIMITIVETYPE_String: {
         const FDE_CSSPROPERTYVALUETABLE* pPropertyValue =
-            FDE_GetCSSPropertyValueByName(pszValue, iValueLen);
+            FDE_GetCSSPropertyValueByName(CFX_WideStringC(pszValue, iValueLen));
         if (pPropertyValue != NULL) {
           argumentArr.Add(
               NewEnumValue(pArgs->pStaticStore, pPropertyValue->eName));
           continue;
         }
         IFDE_CSSValue* pFunctionValue =
             ParseFunction(pArgs, pszValue, iValueLen);
         if (pFunctionValue != NULL) {
           argumentArr.Add(pFunctionValue);
           continue;
@@ skipping 37 matching lines @@
   while (parser.NextValue(eType, pszValue, iValueLen)) {
     switch (eType) {
       case FDE_CSSPRIMITIVETYPE_URI:
         list.Add(FXTARGET_NewWith(pStaticStore) CFDE_CSSPrimitiveValue(
             eType, CopyToLocal(pArgs, pszValue, iValueLen)));
         break;
       case FDE_CSSPRIMITIVETYPE_Number:
         return FALSE;
       case FDE_CSSPRIMITIVETYPE_String: {
         const FDE_CSSPROPERTYVALUETABLE* pValue =
-            FDE_GetCSSPropertyValueByName(pszValue, iValueLen);
+            FDE_GetCSSPropertyValueByName(CFX_WideStringC(pszValue, iValueLen));
         if (pValue != NULL) {
           switch (pValue->eName) {
             case FDE_CSSPROPERTYVALUE_Normal:
             case FDE_CSSPROPERTYVALUE_None: {
               if (list.GetSize() == 0) {
                 list.Add(NewEnumValue(pStaticStore, pValue->eName));
               } else {
                 return FALSE;
               }
             } break;
@@ skipping 113 matching lines @@
         if (dwType & FDE_CSSVALUETYPE_MaybeColor) {
           FX_ARGB dwColor;
           if (FDE_ParseCSSColor(pszValue, iValueLen, dwColor)) {
             list.Add(FXTARGET_NewWith(pStaticStore)
                          CFDE_CSSPrimitiveValue(dwColor));
             continue;
           }
         }
         if (dwType & FDE_CSSVALUETYPE_MaybeEnum) {
           const FDE_CSSPROPERTYVALUETABLE* pValue =
-              FDE_GetCSSPropertyValueByName(pszValue, iValueLen);
+              FDE_GetCSSPropertyValueByName(
+                  CFX_WideStringC(pszValue, iValueLen));
           if (pValue != NULL) {
             list.Add(NewEnumValue(pStaticStore, pValue->eName));
             continue;
           }
         }
         if (dwType & FDE_CSSVALUETYPE_MaybeString) {
           pszValue = CopyToLocal(pArgs, pszValue, iValueLen);
           list.Add(FXTARGET_NewWith(pStaticStore) CFDE_CSSPrimitiveValue(
               FDE_CSSPRIMITIVETYPE_String, pszValue));
         }
@@ skipping 111 matching lines @@
         if (pColor == NULL) {
           FX_ARGB dwColor;
           if (FDE_ParseCSSColor(pszValue, iValueLen, dwColor)) {
             pColor =
                 FXTARGET_NewWith(pStaticStore) CFDE_CSSPrimitiveValue(dwColor);
           }
         }
         break;
       case FDE_CSSPRIMITIVETYPE_String: {
         const FDE_CSSCOLORTABLE* pColorItem =
-            FDE_GetCSSColorByName(pszValue, iValueLen);
+            FDE_GetCSSColorByName(CFX_WideStringC(pszValue, iValueLen));
         if (pColorItem != NULL) {
           if (pColor == NULL) {
             pColor = FXTARGET_NewWith(pStaticStore)
                 CFDE_CSSPrimitiveValue(pColorItem->dwValue);
           }
           continue;
         }
         const FDE_CSSPROPERTYVALUETABLE* pValue =
-            FDE_GetCSSPropertyValueByName(pszValue, iValueLen);
+            FDE_GetCSSPropertyValueByName(CFX_WideStringC(pszValue, iValueLen));
         if (pValue == NULL) {
           continue;
         }
         switch (pValue->eName) {
           case FDE_CSSPROPERTYVALUE_Transparent:
             if (pColor == NULL) {
               pColor = FXTARGET_NewWith(pStaticStore)
                   CFDE_CSSPrimitiveValue((FX_ARGB)0);
             }
             break;
@@ skipping 61 matching lines @@
   while (parser.NextValue(eType, pszValue, iValueLen)) {
     switch (eType) {
       case FDE_CSSPRIMITIVETYPE_URI:
         if (pImage == NULL) {
           pImage = FXTARGET_NewWith(pStaticStore) CFDE_CSSPrimitiveValue(
               eType, CopyToLocal(pArgs, pszValue, iValueLen));
         }
         break;
       case FDE_CSSPRIMITIVETYPE_String: {
         const FDE_CSSPROPERTYVALUETABLE* pValue =
-            FDE_GetCSSPropertyValueByName(pszValue, iValueLen);
+            FDE_GetCSSPropertyValueByName(CFX_WideStringC(pszValue, iValueLen));
         if (pValue == NULL) {
           break;
         }
         switch (pValue->eName) {
           case FDE_CSSPROPERTYVALUE_None:
             if (pImage == NULL) {
               pImage = NewEnumValue(pStaticStore, pValue->eName);
             } else if (pType == NULL) {
               pImage = NewEnumValue(pStaticStore, pValue->eName);
             }
@@ skipping 71 matching lines @@
           break;
         }
         if (pPosX == NULL) {
           pPosX = NewNumberValue(pStaticStore, eType, fValue);
         } else if (pPosY == NULL) {
           pPosY = NewNumberValue(pStaticStore, eType, fValue);
         }
       } break;
       case FDE_CSSPRIMITIVETYPE_String: {
         const FDE_CSSPROPERTYVALUETABLE* pValue =
-            FDE_GetCSSPropertyValueByName(pszValue, iValueLen);
+            FDE_GetCSSPropertyValueByName(CFX_WideStringC(pszValue, iValueLen));
         if (pValue != NULL) {
           switch (pValue->eName) {
             case FDE_CSSPROPERTYVALUE_None:
               if (pImage == NULL) {
                 pImage = NewEnumValue(pStaticStore, pValue->eName);
               }
               break;
             case FDE_CSSPROPERTYVALUE_Transparent:
               if (pColor == NULL) {
                 pColor = FXTARGET_NewWith(pStaticStore)
@@ skipping 32 matching lines @@
               } else if (pPosY == NULL) {
                 pPosX = NewEnumValue(pStaticStore, pValue->eName);
               }
               break;
             default:
               break;
           }
           break;
         }
         const FDE_CSSCOLORTABLE* pColorItem =
-            FDE_GetCSSColorByName(pszValue, iValueLen);
+            FDE_GetCSSColorByName(CFX_WideStringC(pszValue, iValueLen));
         if (pColorItem != NULL) {
           if (pColor == NULL) {
             pColor = FXTARGET_NewWith(pStaticStore)
                 CFDE_CSSPrimitiveValue(pColorItem->dwValue);
           }
         }
       } break;
       case FDE_CSSPRIMITIVETYPE_RGB:
         if (pColor == NULL) {
           FX_ARGB dwColor;
@@ skipping 49 matching lines @@
   IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore;
   CFDE_CSSValueListParser parser(pszValue, iValueLen, '/');
   IFDE_CSSPrimitiveValue *pStyle = NULL, *pVariant = NULL, *pWeight = NULL;
   IFDE_CSSPrimitiveValue *pFontSize = NULL, *pLineHeight = NULL;
   CFDE_CSSValueArray familyList;
   FDE_CSSPRIMITIVETYPE eType;
   while (parser.NextValue(eType, pszValue, iValueLen)) {
     switch (eType) {
       case FDE_CSSPRIMITIVETYPE_String: {
         const FDE_CSSPROPERTYVALUETABLE* pValue =
-            FDE_GetCSSPropertyValueByName(pszValue, iValueLen);
+            FDE_GetCSSPropertyValueByName(CFX_WideStringC(pszValue, iValueLen));
         if (pValue != NULL) {
           switch (pValue->eName) {
             case FDE_CSSPROPERTYVALUE_XxSmall:
             case FDE_CSSPROPERTYVALUE_XSmall:
             case FDE_CSSPROPERTYVALUE_Small:
             case FDE_CSSPROPERTYVALUE_Medium:
             case FDE_CSSPROPERTYVALUE_Large:
             case FDE_CSSPROPERTYVALUE_XLarge:
             case FDE_CSSPROPERTYVALUE_XxLarge:
             case FDE_CSSPROPERTYVALUE_Smaller:
@@ skipping 117 matching lines @@
   IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore;
   CFDE_CSSValueListParser parser(pszValue, iValueLen, ' ');
   IFDE_CSSPrimitiveValue* pColumnRuleWidth = NULL;
   IFDE_CSSPrimitiveValue* pColumnRuleStyle = NULL;
   IFDE_CSSPrimitiveValue* pColumnRuleColor = NULL;
   FDE_CSSPRIMITIVETYPE eType;
   while (parser.NextValue(eType, pszValue, iValueLen)) {
     switch (eType) {
       case FDE_CSSPRIMITIVETYPE_String: {
         const FDE_CSSPROPERTYVALUETABLE* pValue =
-            FDE_GetCSSPropertyValueByName(pszValue, iValueLen);
+            FDE_GetCSSPropertyValueByName(CFX_WideStringC(pszValue, iValueLen));
         if (pValue != NULL) {
           switch (pValue->eName) {
             case FDE_CSSPROPERTYVALUE_None:
             case FDE_CSSPROPERTYVALUE_Hidden:
             case FDE_CSSPROPERTYVALUE_Dotted:
             case FDE_CSSPROPERTYVALUE_Dashed:
             case FDE_CSSPROPERTYVALUE_Solid:
             case FDE_CSSPROPERTYVALUE_Double:
             case FDE_CSSPROPERTYVALUE_Groove:
             case FDE_CSSPROPERTYVALUE_Ridge:
@@ skipping 76 matching lines @@
     FX_BOOL bImportant) {
   IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore;
   CFDE_CSSValueListParser parser(pszValue, iValueLen, ' ');
   CFDE_CSSValueArray arrEmphasisStyle;
   FDE_CSSPRIMITIVETYPE eType;
   IFDE_CSSPrimitiveValue* pEmphasisColor = NULL;
   while (parser.NextValue(eType, pszValue, iValueLen)) {
     switch (eType) {
       case FDE_CSSPRIMITIVETYPE_String: {
         const FDE_CSSPROPERTYVALUETABLE* pValue =
-            FDE_GetCSSPropertyValueByName(pszValue, iValueLen);
+            FDE_GetCSSPropertyValueByName(CFX_WideStringC(pszValue, iValueLen));
         if (pValue != NULL) {
           arrEmphasisStyle.Add(NewEnumValue(pStaticStore, pValue->eName));
           continue;
         }
         FX_ARGB dwColor;
         if (FDE_ParseCSSColor(pszValue, iValueLen, dwColor)) {
           pEmphasisColor =
               FXTARGET_NewWith(pStaticStore) CFDE_CSSPrimitiveValue(dwColor);
           continue;
         }
@@ skipping 32 matching lines @@
     FX_BOOL bImportant) {
   IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore;
   CFDE_CSSValueListParser parser(pszValue, iValueLen, ' ');
   IFDE_CSSPrimitiveValue* pColumnWidth = NULL;
   IFDE_CSSPrimitiveValue* pColumnCount = NULL;
   FDE_CSSPRIMITIVETYPE eType;
   while (parser.NextValue(eType, pszValue, iValueLen)) {
     switch (eType) {
       case FDE_CSSPRIMITIVETYPE_String: {
         const FDE_CSSPROPERTYVALUETABLE* pValue =
-            FDE_GetCSSPropertyValueByName(pszValue, iValueLen);
+            FDE_GetCSSPropertyValueByName(CFX_WideStringC(pszValue, iValueLen));
         if (pValue == NULL && pValue->eName == FDE_CSSPROPERTYVALUE_Auto) {
           pColumnWidth = NewEnumValue(pStaticStore, pValue->eName);
         }
       } break;
       case FDE_CSSPRIMITIVETYPE_Number: {
         FX_FLOAT fValue;
         if (FDE_ParseCSSNumber(pszValue, iValueLen, fValue, eType)) {
           switch (eType) {
             case FDE_CSSPRIMITIVETYPE_Number:
               if (pColumnCount == NULL) {
@@ skipping 31 matching lines @@
     int32_t iValueLen,
     FX_BOOL bImportant) {
   IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore;
   CFDE_CSSValueListParser parser(pszValue, iValueLen, ' ');
   IFDE_CSSPrimitiveValue* pOverflowX = NULL;
   IFDE_CSSPrimitiveValue* pOverflowY = NULL;
   FDE_CSSPRIMITIVETYPE eType;
   while (parser.NextValue(eType, pszValue, iValueLen)) {
     if (eType == FDE_CSSPRIMITIVETYPE_String) {
       const FDE_CSSPROPERTYVALUETABLE* pValue =
-          FDE_GetCSSPropertyValueByName(pszValue, iValueLen);
+          FDE_GetCSSPropertyValueByName(CFX_WideStringC(pszValue, iValueLen));
       if (pValue != NULL) {
         switch (pValue->eName) {
           case FDE_CSSOVERFLOW_Visible:
           case FDE_CSSOVERFLOW_Hidden:
           case FDE_CSSOVERFLOW_Scroll:
           case FDE_CSSOVERFLOW_Auto:
           case FDE_CSSOVERFLOW_NoDisplay:
           case FDE_CSSOVERFLOW_NoContent:
             if (pOverflowX != NULL && pOverflowY != NULL) {
               return FALSE;
@@ skipping 13 matching lines @@
     return FALSE;
   } else if (pOverflowY == NULL) {
     pOverflowY = NewEnumValue(pStaticStore, pOverflowX->GetEnum());
   }
   AddPropertyHolder(pStaticStore, FDE_CSSPROPERTY_OverflowX, pOverflowX,
                     bImportant);
   AddPropertyHolder(pStaticStore, FDE_CSSPROPERTY_OverflowY, pOverflowY,
                     bImportant);
   return TRUE;
 }