Rename CFX_WideStringC::raw_str() to c_str()

No functional change intended.

This difference in naming is standing in the way of consolidating
some of the string code between Wide and Byte strings. The Wide
code wants to call raw_str() in exactly the same spots that the
Byte code calls c_str().  This makes sense, because in both places we
get a character type back, and not a uint*_t type.  If WideStringC
had a raw_str() method, it would have to return uint32_t or similar.

R=dsinclair@chromium.org

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

21 files changed, 61 insertions, 66 deletions

diff --git a/xfa/fde/css/fde_csscache.cpp b/xfa/fde/css/fde_csscache.cpp
index d8fc1a1b19..c68d4ddb49 100644
--- a/xfa/fde/css/fde_csscache.cpp
+++ b/xfa/fde/css/fde_csscache.cpp
@@ -107,23 +107,21 @@ FDE_CSSTagCache::FDE_CSSTagCache(FDE_CSSTagCache* parent,
       dwClassHashs(1) {
   FXSYS_assert(pTag != NULL);
   CFX_WideStringC wsValue, wsName = pTag->GetTagName();
-  dwTagHash =
-      FX_HashCode_String_GetW(wsName.raw_str(), wsName.GetLength(), TRUE);
+  dwTagHash = FX_HashCode_String_GetW(wsName.c_str(), wsName.GetLength(), TRUE);
   FX_POSITION pos = pTag->GetFirstAttribute();
   while (pos != NULL) {
     pTag->GetNextAttribute(pos, wsName, wsValue);
     uint32_t dwNameHash =
-        FX_HashCode_String_GetW(wsName.raw_str(), wsName.GetLength(), TRUE);
+        FX_HashCode_String_GetW(wsName.c_str(), wsName.GetLength(), TRUE);
     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);
     if (dwNameHash == s_dwClassHash) {
       uint32_t dwHash =
-          FX_HashCode_String_GetW(wsValue.raw_str(), wsValue.GetLength());
+          FX_HashCode_String_GetW(wsValue.c_str(), wsValue.GetLength());
       dwClassHashs.Add(dwHash);
     } else if (dwNameHash == s_dwIDHash) {
-      dwIDHash =
-          FX_HashCode_String_GetW(wsValue.raw_str(), wsValue.GetLength());
+      dwIDHash = FX_HashCode_String_GetW(wsValue.c_str(), wsValue.GetLength());
     }
   }
 }
diff --git a/xfa/fde/css/fde_cssstyleselector.cpp b/xfa/fde/css/fde_cssstyleselector.cpp
index 1a27a7e5c9..f1e73dd5d1 100644
--- a/xfa/fde/css/fde_cssstyleselector.cpp
+++ b/xfa/fde/css/fde_cssstyleselector.cpp
@@ -437,7 +437,7 @@ void CFDE_CSSStyleSelector::ComputeStyle(
     do {
       pTag->GetNextAttribute(pos, wsAttri, wsValue);
       dwAttriHash =
-          FX_HashCode_String_GetW(wsAttri.raw_str(), wsAttri.GetLength(), TRUE);
+          FX_HashCode_String_GetW(wsAttri.c_str(), wsAttri.GetLength(), TRUE);
       static const uint32_t s_dwStyleHash =
           FX_HashCode_String_GetW(L"style", 5, TRUE);
       static const uint32_t s_dwAlignHash =
@@ -446,7 +446,7 @@ void CFDE_CSSStyleSelector::ComputeStyle(
         if (pDecl == NULL) {
           pDecl = FXTARGET_NewWith(m_pInlineStyleStore) CFDE_CSSDeclaration;
         }
-        AppendInlineStyle(pDecl, wsValue.raw_str(), wsValue.GetLength());
+        AppendInlineStyle(pDecl, wsValue.c_str(), wsValue.GetLength());
       } else if (dwAttriHash == s_dwAlignHash) {
         if (pDecl == NULL) {
           pDecl = FXTARGET_NewWith(m_pInlineStyleStore) CFDE_CSSDeclaration;
@@ -455,7 +455,7 @@ void CFDE_CSSStyleSelector::ComputeStyle(
         args.pStringCache = NULL;
         args.pStaticStore = m_pInlineStyleStore;
         args.pProperty = FDE_GetCSSPropertyByEnum(FDE_CSSPROPERTY_TextAlign);
-        pDecl->AddProperty(&args, wsValue.raw_str(), wsValue.GetLength());
+        pDecl->AddProperty(&args, wsValue.c_str(), wsValue.GetLength());
       }
     } while (pos != NULL);
     if (pDecl != NULL) {
diff --git a/xfa/fgas/localization/fgas_locale.cpp b/xfa/fgas/localization/fgas_locale.cpp
index 878cbf6aeb..f91bc1b78f 100644
--- a/xfa/fgas/localization/fgas_locale.cpp
+++ b/xfa/fgas/localization/fgas_locale.cpp
@@ -68,8 +68,8 @@ static FX_STRSIZE FX_Local_Find(const CFX_WideStringC& wsSymbols,
     return -1;
   }
   const FX_WCHAR* lpsz =
-      (const FX_WCHAR*)FXSYS_wcschr(wsSymbols.raw_str() + nStart, ch);
-  return (lpsz == NULL) ? -1 : (FX_STRSIZE)(lpsz - wsSymbols.raw_str());
+      (const FX_WCHAR*)FXSYS_wcschr(wsSymbols.c_str() + nStart, ch);
+  return (lpsz == NULL) ? -1 : (FX_STRSIZE)(lpsz - wsSymbols.c_str());
 }
 static const FX_WCHAR* const gs_LocalNumberSymbols[] = {
     L"decimal", L"grouping",       L"percent",      L"minus",
@@ -3856,7 +3856,7 @@ FX_BOOL FX_TimeFromCanonical(const CFX_WideStringC& wsTime,
   uint8_t second = 0;
   uint16_t millisecond = 0;
   int cc_start = 0, cc = cc_start;
-  const FX_WCHAR* str = (const FX_WCHAR*)wsTime.raw_str();
+  const FX_WCHAR* str = wsTime.c_str();
   int len = wsTime.GetLength();
   while (cc < len && cc < 2) {
     if (!FX_IsDigit(str[cc])) {
@@ -4702,7 +4702,7 @@ CFX_Decimal::CFX_Decimal(FX_FLOAT val, uint8_t scale) {
   m_uFlags = FXMATH_DECIMAL_MAKEFLAGS(val < 0 && IsNotZero(), scale);
 }
 CFX_Decimal::CFX_Decimal(const CFX_WideStringC& strObj) {
-  const FX_WCHAR* str = strObj.raw_str();
+  const FX_WCHAR* str = strObj.c_str();
   const FX_WCHAR* strBound = str + strObj.GetLength();
   FX_BOOL pointmet = 0;
   FX_BOOL negmet = 0;
diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp
index eec5337052..05263f17fd 100644
--- a/xfa/fwl/theme/cfwl_widgettp.cpp
+++ b/xfa/fwl/theme/cfwl_widgettp.cpp
@@ -736,7 +736,7 @@ FX_BOOL CFWL_FontData::LoadFont(const CFX_WideStringC& wsFontFamily,
     m_pFontMgr = IFX_FontMgr::Create(m_pFontSource);
 #endif
   }
-  m_pFont = IFX_Font::LoadFont(wsFontFamily.raw_str(), dwFontStyles, dwCodePage,
+  m_pFont = IFX_Font::LoadFont(wsFontFamily.c_str(), dwFontStyles, dwCodePage,
                                m_pFontMgr);
   return m_pFont != NULL;
 }
diff --git a/xfa/fxfa/app/xfa_ffbarcode.cpp b/xfa/fxfa/app/xfa_ffbarcode.cpp
index 28dfa86066..5f38fafa9f 100644
--- a/xfa/fxfa/app/xfa_ffbarcode.cpp
+++ b/xfa/fxfa/app/xfa_ffbarcode.cpp
@@ -98,7 +98,7 @@ XFA_LPCBARCODETYPEENUMINFO XFA_GetBarcodeTypeByName(
   if (iLength == 0) {
     return NULL;
   }
-  uint32_t uHash = FX_HashCode_String_GetW(wsName.raw_str(), iLength, TRUE);
+  uint32_t uHash = FX_HashCode_String_GetW(wsName.c_str(), iLength, TRUE);
   int32_t iStart = 0, iEnd = g_iXFABarcodeTypeCount - 1;
   do {
     int32_t iMid = (iStart + iEnd) / 2;
diff --git a/xfa/fxfa/app/xfa_ffdoc.cpp b/xfa/fxfa/app/xfa_ffdoc.cpp
index 58cf1a269a..acbddb4cf0 100644
--- a/xfa/fxfa/app/xfa_ffdoc.cpp
+++ b/xfa/fxfa/app/xfa_ffdoc.cpp
@@ -327,7 +327,7 @@ CFX_DIBitmap* CXFA_FFDoc::GetPDFNamedImage(const CFX_WideStringC& wsName,
     return nullptr;
 
   uint32_t dwHash =
-      FX_HashCode_String_GetW(wsName.raw_str(), wsName.GetLength(), FALSE);
+      FX_HashCode_String_GetW(wsName.c_str(), wsName.GetLength(), FALSE);
   FX_IMAGEDIB_AND_DPI* imageDIBDpi = nullptr;
   if (m_mapNamedImages.Lookup((void*)(uintptr_t)dwHash, (void*&)imageDIBDpi)) {
     iImageXDpi = imageDIBDpi->iImageXDpi;
@@ -348,7 +348,7 @@ CFX_DIBitmap* CXFA_FFDoc::GetPDFNamedImage(const CFX_WideStringC& wsName,
     return nullptr;
 
   CPDF_NameTree nametree(pXFAImages);
-  CFX_ByteString bsName = PDF_EncodeText(wsName.raw_str(), wsName.GetLength());
+  CFX_ByteString bsName = PDF_EncodeText(wsName.c_str(), wsName.GetLength());
   CPDF_Object* pObject = nametree.LookupValue(bsName);
   if (!pObject) {
     int32_t iCount = nametree.GetCount();
@@ -386,7 +386,7 @@ CFX_DIBitmap* CXFA_FFDoc::GetPDFNamedImage(const CFX_WideStringC& wsName,
 
 CFDE_XMLElement* CXFA_FFDoc::GetPackageData(const CFX_WideStringC& wsPackage) {
   uint32_t packetHash =
-      FX_HashCode_String_GetW(wsPackage.raw_str(), wsPackage.GetLength());
+      FX_HashCode_String_GetW(wsPackage.c_str(), wsPackage.GetLength());
   CXFA_Node* pNode = ToNode(m_pDocument->GetXFAObject(packetHash));
   if (!pNode) {
     return NULL;
@@ -401,7 +401,7 @@ FX_BOOL CXFA_FFDoc::SavePackage(const CFX_WideStringC& wsPackage,
                                 CXFA_ChecksumContext* pCSContext) {
   CXFA_DataExporter* pExport = new CXFA_DataExporter(m_pDocument);
   uint32_t packetHash =
-      FX_HashCode_String_GetW(wsPackage.raw_str(), wsPackage.GetLength());
+      FX_HashCode_String_GetW(wsPackage.c_str(), wsPackage.GetLength());
   CXFA_Node* pNode = NULL;
   if (packetHash == XFA_HASHCODE_Xfa) {
     pNode = m_pDocument->GetRoot();
diff --git a/xfa/fxfa/app/xfa_fontmgr.cpp b/xfa/fxfa/app/xfa_fontmgr.cpp
index 8ffb7ce578..facce24177 100644
--- a/xfa/fxfa/app/xfa_fontmgr.cpp
+++ b/xfa/fxfa/app/xfa_fontmgr.cpp
@@ -1699,7 +1699,7 @@ void XFA_LocalFontNameToEnglishName(const CFX_WideStringC& wsLocalName,
     _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ ||   \
     _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
   uint32_t dwLocalNameHash = FX_HashCode_String_GetW(
-      wsLocalName.raw_str(), wsLocalName.GetLength(), TRUE);
+      wsLocalName.c_str(), wsLocalName.GetLength(), TRUE);
   int32_t iStart = 0;
   int32_t iEnd = sizeof(g_XFAFontsMap) / sizeof(XFA_FONTINFO) - 1;
   int32_t iMid = 0;
@@ -1891,7 +1891,7 @@ IFX_Font* CXFA_PDFFontMgr::GetFont(const CFX_WideStringC& wsFontFamily,
                                    CPDF_Font** pPDFFont,
                                    FX_BOOL bStrictMatch) {
   uint32_t dwHashCode =
-      FX_HashCode_String_GetW(wsFontFamily.raw_str(), wsFontFamily.GetLength());
+      FX_HashCode_String_GetW(wsFontFamily.c_str(), wsFontFamily.GetLength());
   CFX_ByteString strKey;
   strKey.Format("%u%u", dwHashCode, dwFontStyles);
   auto it = m_FontMap.find(strKey);
@@ -2017,7 +2017,7 @@ IFX_Font* CXFA_FontMgr::GetFont(CXFA_FFDoc* hDoc,
                                 const CFX_WideStringC& wsFontFamily,
                                 uint32_t dwFontStyles,
                                 uint16_t wCodePage) {
-  uint32_t dwHash = FX_HashCode_String_GetW(wsFontFamily.raw_str(),
+  uint32_t dwHash = FX_HashCode_String_GetW(wsFontFamily.c_str(),
                                             wsFontFamily.GetLength(), FALSE);
   CFX_ByteString bsKey;
   bsKey.Format("%u%u%u", dwHash, dwFontStyles, wCodePage);
diff --git a/xfa/fxfa/app/xfa_textlayout.cpp b/xfa/fxfa/app/xfa_textlayout.cpp
index cd323633c0..f92dbeffdf 100644
--- a/xfa/fxfa/app/xfa_textlayout.cpp
+++ b/xfa/fxfa/app/xfa_textlayout.cpp
@@ -308,7 +308,7 @@ void CXFA_TextParser::ParseTagInfo(CFDE_XMLNode* pXMLNode,
     tagProvider.m_bTagAviliable =
         lookup.Lookup(dwHashCode, s_XFATagName, s_iCount) > -1;
     CFX_WideString wsValue;
-    pXMLElement->GetString(FX_WSTRC(L"style").raw_str(), wsValue);
+    pXMLElement->GetString(FX_WSTRC(L"style").c_str(), wsValue);
     if (!wsValue.IsEmpty()) {
       tagProvider.SetAttribute(FX_WSTRC(L"style"), wsValue);
     }
@@ -524,7 +524,7 @@ FX_BOOL CXFA_TextParser::GetEmbbedObj(CXFA_TextProvider* pTextProvider,
   if (pXMLNode->GetType() == FDE_XMLNODE_Element) {
     CFDE_XMLElement* pElement = static_cast<CFDE_XMLElement*>(pXMLNode);
     CFX_WideString wsAttr;
-    pElement->GetString(FX_WSTRC(L"xfa:embed").raw_str(), wsAttr);
+    pElement->GetString(FX_WSTRC(L"xfa:embed").c_str(), wsAttr);
     if (wsAttr.IsEmpty()) {
       return FALSE;
     }
@@ -532,7 +532,7 @@ FX_BOOL CXFA_TextParser::GetEmbbedObj(CXFA_TextProvider* pTextProvider,
       wsAttr.Delete(0);
     }
     CFX_WideString ws;
-    pElement->GetString(FX_WSTRC(L"xfa:embedType").raw_str(), ws);
+    pElement->GetString(FX_WSTRC(L"xfa:embedType").c_str(), ws);
     if (ws.IsEmpty()) {
       ws = L"som";
     } else {
@@ -543,7 +543,7 @@ FX_BOOL CXFA_TextParser::GetEmbbedObj(CXFA_TextProvider* pTextProvider,
       return FALSE;
     }
     ws.Empty();
-    pElement->GetString(FX_WSTRC(L"xfa:embedMode").raw_str(), ws);
+    pElement->GetString(FX_WSTRC(L"xfa:embedMode").c_str(), ws);
     if (ws.IsEmpty()) {
       ws = L"formatted";
     } else {
@@ -1422,7 +1422,7 @@ FX_BOOL CXFA_TextLayout::LoadRichText(CFDE_XMLNode* pXMLNode,
         if (wsName == FX_WSTRC(L"a")) {
           CFX_WideString wsLinkContent;
           FXSYS_assert(pElement);
-          pElement->GetString(FX_WSTRC(L"href").raw_str(), wsLinkContent);
+          pElement->GetString(FX_WSTRC(L"href").c_str(), wsLinkContent);
           if (!wsLinkContent.IsEmpty()) {
             pLinkData = FXTARGET_NewWith(m_pAllocator) CXFA_LinkUserData(
                 m_pAllocator,
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
index 518d233745..dfd7313d12 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
@@ -4270,7 +4270,7 @@ void CXFA_FM2JSContext::EncodeXML(const CFX_ByteStringC& szXMLString,
 FX_BOOL CXFA_FM2JSContext::HTMLSTR2Code(const CFX_WideStringC& pData,
                                         uint32_t& iCode) {
   int32_t iLength = pData.GetLength();
-  uint32_t uHash = FX_HashCode_String_GetW(pData.raw_str(), iLength);
+  uint32_t uHash = FX_HashCode_String_GetW(pData.c_str(), iLength);
   XFA_FMHtmlHashedReserveCode htmlhashedreservecode;
   int32_t iStart = 0,
           iEnd = (sizeof(reservesForDecode) / sizeof(reservesForDecode[0])) - 1;
diff --git a/xfa/fxfa/fm2js/xfa_lexer.cpp b/xfa/fxfa/fm2js/xfa_lexer.cpp
index b4c16eb8e4..4462bd5154 100644
--- a/xfa/fxfa/fm2js/xfa_lexer.cpp
+++ b/xfa/fxfa/fm2js/xfa_lexer.cpp
@@ -165,9 +165,7 @@ CXFA_FMToken::CXFA_FMToken(uint32_t uLineNum)
 
 CXFA_FMLexer::CXFA_FMLexer(const CFX_WideStringC& wsFormCalc,
                            CXFA_FMErrorInfo* pErrorInfo)
-    : m_ptr(wsFormCalc.raw_str()),
-      m_uCurrentLine(1),
-      m_pErrorInfo(pErrorInfo) {}
+    : m_ptr(wsFormCalc.c_str()), m_uCurrentLine(1), m_pErrorInfo(pErrorInfo) {}
 
 CXFA_FMToken* CXFA_FMLexer::NextToken() {
   m_pToken.reset(Scan());
@@ -519,7 +517,7 @@ 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.raw_str(), iLength, TRUE);
+  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;
diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp b/xfa/fxfa/fm2js/xfa_simpleexpression.cpp
index d5936bc6c1..b600b52ebd 100644
--- a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp
+++ b/xfa/fxfa/fm2js/xfa_simpleexpression.cpp
@@ -502,7 +502,7 @@ bool CXFA_FMCallExpression::IsBuildInFunc(CFX_WideTextBuf* funcName) {
 uint32_t CXFA_FMCallExpression::IsMethodWithObjParam(
     const CFX_WideStringC& methodName) {
   int32_t iLength = methodName.GetLength();
-  uint32_t uHash = FX_HashCode_String_GetW(methodName.raw_str(), iLength);
+  uint32_t uHash = FX_HashCode_String_GetW(methodName.c_str(), iLength);
   XFA_FMSOMMethod somMethodWithObjPara;
   uint32_t parameters = 0x00;
   int32_t iStart = 0,
diff --git a/xfa/fxfa/parser/xfa_basic_imp.cpp b/xfa/fxfa/parser/xfa_basic_imp.cpp
index 13c879a31e..07f1b82301 100644
--- a/xfa/fxfa/parser/xfa_basic_imp.cpp
+++ b/xfa/fxfa/parser/xfa_basic_imp.cpp
@@ -26,7 +26,7 @@ const XFA_PACKETINFO* XFA_GetPacketByName(const CFX_WideStringC& wsName) {
   if (iLength == 0) {
     return NULL;
   }
-  uint32_t uHash = FX_HashCode_String_GetW(wsName.raw_str(), iLength);
+  uint32_t uHash = FX_HashCode_String_GetW(wsName.c_str(), iLength);
   int32_t iStart = 0, iEnd = g_iXFAPacketCount - 1;
   do {
     int32_t iMid = (iStart + iEnd) / 2;
@@ -68,7 +68,7 @@ const XFA_ATTRIBUTEENUMINFO* XFA_GetAttributeEnumByName(
   if (iLength == 0) {
     return NULL;
   }
-  uint32_t uHash = FX_HashCode_String_GetW(wsName.raw_str(), iLength);
+  uint32_t uHash = FX_HashCode_String_GetW(wsName.c_str(), iLength);
   int32_t iStart = 0, iEnd = g_iXFAEnumCount - 1;
   do {
     int32_t iMid = (iStart + iEnd) / 2;
@@ -94,7 +94,7 @@ const XFA_ATTRIBUTEINFO* XFA_GetAttributeByName(const CFX_WideStringC& wsName) {
   if (iLength == 0) {
     return NULL;
   }
-  uint32_t uHash = FX_HashCode_String_GetW(wsName.raw_str(), iLength);
+  uint32_t uHash = FX_HashCode_String_GetW(wsName.c_str(), iLength);
   int32_t iStart = 0, iEnd = g_iXFAAttributeCount - 1;
   do {
     int32_t iMid = (iStart + iEnd) / 2;
@@ -195,7 +195,7 @@ const XFA_ELEMENTINFO* XFA_GetElementByName(const CFX_WideStringC& wsName) {
   if (iLength == 0) {
     return NULL;
   }
-  uint32_t uHash = FX_HashCode_String_GetW(wsName.raw_str(), iLength);
+  uint32_t uHash = FX_HashCode_String_GetW(wsName.c_str(), iLength);
   int32_t iStart = 0, iEnd = g_iXFAElementCount - 1;
   do {
     int32_t iMid = (iStart + iEnd) / 2;
@@ -380,7 +380,7 @@ const XFA_METHODINFO* XFA_GetMethodByName(XFA_ELEMENT eElement,
       iElementIndex = scriptIndex->wParentIndex;
       continue;
     }
-    uint32_t uHash = FX_HashCode_String_GetW(wsMethodName.raw_str(), iLength);
+    uint32_t uHash = FX_HashCode_String_GetW(wsMethodName.c_str(), iLength);
     int32_t iStart = scriptIndex->wMethodStart, iEnd = iStart + icount - 1;
     do {
       int32_t iMid = (iStart + iEnd) / 2;
@@ -412,8 +412,7 @@ const XFA_SCRIPTATTRIBUTEINFO* XFA_GetScriptAttributeByName(
       iElementIndex = scriptIndex->wParentIndex;
       continue;
     }
-    uint32_t uHash =
-        FX_HashCode_String_GetW(wsAttributeName.raw_str(), iLength);
+    uint32_t uHash = FX_HashCode_String_GetW(wsAttributeName.c_str(), iLength);
     int32_t iStart = scriptIndex->wAttributeStart, iEnd = iStart + icount - 1;
     do {
       int32_t iMid = (iStart + iEnd) / 2;
@@ -438,7 +437,7 @@ void CXFA_Measurement::Set(const CFX_WideStringC& wsMeasure) {
   }
   int32_t iUsedLen = 0;
   int32_t iOffset = (wsMeasure.GetAt(0) == L'=') ? 1 : 0;
-  FX_FLOAT fValue = FX_wcstof(wsMeasure.raw_str() + iOffset,
+  FX_FLOAT fValue = FX_wcstof(wsMeasure.c_str() + iOffset,
                               wsMeasure.GetLength() - iOffset, &iUsedLen);
   XFA_UNIT eUnit = GetUnit(wsMeasure.Mid(iOffset + iUsedLen));
   Set(fValue, eUnit);
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
index a28b4994ab..2217b94a3b 100644
--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
@@ -404,7 +404,7 @@ static CXFA_Node* XFA_DataMerge_FindGlobalDataNode(CXFA_Document* pDocument,
                                                    CXFA_Node* pDataScope,
                                                    XFA_ELEMENT eMatchNodeType) {
   uint32_t dwNameHash =
-      wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.raw_str(),
+      wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.c_str(),
                                                      wsName.GetLength());
   if (dwNameHash != 0) {
     CXFA_Node* pBounded = XFA_DataMerge_GetGlobalBinding(pDocument, dwNameHash);
@@ -424,7 +424,7 @@ static CXFA_Node* XFA_DataMerge_FindOnceDataNode(CXFA_Document* pDocument,
                                                  CXFA_Node* pDataScope,
                                                  XFA_ELEMENT eMatchNodeType) {
   uint32_t dwNameHash =
-      wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.raw_str(),
+      wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.c_str(),
                                                      wsName.GetLength());
   if (dwNameHash != 0) {
     for (CXFA_Node *pCurDataScope = pDataScope, *pLastDataScope = NULL;
diff --git a/xfa/fxfa/parser/xfa_document_imp.cpp b/xfa/fxfa/parser/xfa_document_imp.cpp
index bb2001e803..9bdee05a55 100644
--- a/xfa/fxfa/parser/xfa_document_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_imp.cpp
@@ -96,7 +96,7 @@ CXFA_FFNotify* CXFA_Document::GetNotify() const {
 }
 CXFA_Object* CXFA_Document::GetXFAObject(const CFX_WideStringC& wsNodeName) {
   return GetXFAObject(
-      FX_HashCode_String_GetW(wsNodeName.raw_str(), wsNodeName.GetLength()));
+      FX_HashCode_String_GetW(wsNodeName.c_str(), wsNodeName.GetLength()));
 }
 CXFA_Object* CXFA_Document::GetXFAObject(uint32_t dwNodeNameHash) {
   switch (dwNodeNameHash) {
@@ -367,7 +367,7 @@ void CXFA_Document::DoProtoMerge() {
        pNode = sIterator.MoveToNext()) {
     CFX_WideStringC wsIDVal;
     if (pNode->TryCData(XFA_ATTRIBUTE_Id, wsIDVal) && !wsIDVal.IsEmpty()) {
-      mIDMap[FX_HashCode_String_GetW(wsIDVal.raw_str(), wsIDVal.GetLength())] =
+      mIDMap[FX_HashCode_String_GetW(wsIDVal.c_str(), wsIDVal.GetLength())] =
           pNode;
     }
     CFX_WideStringC wsUseVal;
@@ -429,7 +429,7 @@ void CXFA_Document::DoProtoMerge() {
       }
     } else if (!wsID.IsEmpty()) {
       if (!mIDMap.Lookup(
-              FX_HashCode_String_GetW(wsID.raw_str(), wsID.GetLength()),
+              FX_HashCode_String_GetW(wsID.c_str(), wsID.GetLength()),
               pProtoNode)) {
         continue;
       }
diff --git a/xfa/fxfa/parser/xfa_document_serialize.cpp b/xfa/fxfa/parser/xfa_document_serialize.cpp
index 39590f6e8f..516a947ffb 100644
--- a/xfa/fxfa/parser/xfa_document_serialize.cpp
+++ b/xfa/fxfa/parser/xfa_document_serialize.cpp
@@ -389,7 +389,7 @@ static void XFA_DataExporter_RegenerateFormFile_Container(
   CFX_WideStringC wsElement;
   pNode->GetClassName(wsElement);
   pStream->WriteString(L"<", 1);
-  pStream->WriteString(wsElement.raw_str(), wsElement.GetLength());
+  pStream->WriteString(wsElement.c_str(), wsElement.GetLength());
   CFX_WideString wsOutput;
   XFA_SaveAttribute(pNode, XFA_ATTRIBUTE_Name, FX_WSTRC(L"name"), TRUE,
                     wsOutput);
@@ -418,7 +418,7 @@ static void XFA_DataExporter_RegenerateFormFile_Container(
       pChildNode = pChildNode->GetNodeItem(XFA_NODEITEM_NextSibling);
     }
     pStream->WriteString(L"</", 2);
-    pStream->WriteString(wsElement.raw_str(), wsElement.GetLength());
+    pStream->WriteString(wsElement.c_str(), wsElement.GetLength());
     pStream->WriteString(L"\n>", 2);
   } else {
     pStream->WriteString(L"\n/>", 3);
diff --git a/xfa/fxfa/parser/xfa_layout_itemlayout.cpp b/xfa/fxfa/parser/xfa_layout_itemlayout.cpp
index d69bf2506c..8278ce990d 100644
--- a/xfa/fxfa/parser/xfa_layout_itemlayout.cpp
+++ b/xfa/fxfa/parser/xfa_layout_itemlayout.cpp
@@ -1380,7 +1380,7 @@ void CXFA_ItemLayoutProcessor::DoLayoutTableContainer(CXFA_Node* pLayoutNode) {
   CFX_WideStringC wsColumnWidths;
   if (pLayoutNode->TryCData(XFA_ATTRIBUTE_ColumnWidths, wsColumnWidths)) {
     CFX_WideStringArray widths;
-    if (FX_SeparateStringW(wsColumnWidths.raw_str(), wsColumnWidths.GetLength(),
+    if (FX_SeparateStringW(wsColumnWidths.c_str(), wsColumnWidths.GetLength(),
                            L' ', widths) > 0) {
       int32_t iCols = widths.GetSize();
       CFX_WideString wsWidth;
diff --git a/xfa/fxfa/parser/xfa_object_imp.cpp b/xfa/fxfa/parser/xfa_object_imp.cpp
index 1dd526571d..8be5746960 100644
--- a/xfa/fxfa/parser/xfa_object_imp.cpp
+++ b/xfa/fxfa/parser/xfa_object_imp.cpp
@@ -56,7 +56,7 @@ void CXFA_Object::Script_ObjectClass_ClassName(FXJSE_HVALUE hValue,
     CFX_WideStringC className;
     GetClassName(className);
     FXJSE_Value_SetUTF8String(
-        hValue, FX_UTF8Encode(className.raw_str(), className.GetLength())
+        hValue, FX_UTF8Encode(className.c_str(), className.GetLength())
                     .AsByteStringC());
   } else {
     ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
@@ -1799,7 +1799,7 @@ static const XFA_ExecEventParaInfo gs_eventParaInfos[] = {
 const XFA_ExecEventParaInfo* GetEventParaInfoByName(
     const CFX_WideStringC& wsEventName) {
   int32_t iLength = wsEventName.GetLength();
-  uint32_t uHash = FX_HashCode_String_GetW(wsEventName.raw_str(), iLength);
+  uint32_t uHash = FX_HashCode_String_GetW(wsEventName.c_str(), iLength);
   const XFA_ExecEventParaInfo* eventParaInfo = NULL;
   int32_t iStart = 0,
           iEnd = (sizeof(gs_eventParaInfos) / sizeof(gs_eventParaInfos[0])) - 1;
@@ -3769,7 +3769,7 @@ enum XFA_KEYTYPE {
   XFA_KEYTYPE_Element,
 };
 void* XFA_GetMapKey_Custom(const CFX_WideStringC& wsKey) {
-  uint32_t dwKey = FX_HashCode_String_GetW(wsKey.raw_str(), wsKey.GetLength());
+  uint32_t dwKey = FX_HashCode_String_GetW(wsKey.c_str(), wsKey.GetLength());
   return (void*)(uintptr_t)((dwKey << 1) | XFA_KEYTYPE_Custom);
 }
 void* XFA_GetMapKey_Element(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute) {
@@ -3808,7 +3808,7 @@ FX_BOOL CXFA_Node::SetAttribute(XFA_ATTRIBUTE eAttr,
     case XFA_ATTRIBUTETYPE_Integer:
       return SetInteger(
           pAttr->eName,
-          FXSYS_round(FX_wcstof(wsValue.raw_str(), wsValue.GetLength())),
+          FXSYS_round(FX_wcstof(wsValue.c_str(), wsValue.GetLength())),
           bNotify);
     case XFA_ATTRIBUTETYPE_Measure:
       return SetMeasure(pAttr->eName, CXFA_Measurement(wsValue), bNotify);
@@ -4751,7 +4751,7 @@ FX_BOOL CXFA_Node::RemoveChild(CXFA_Node* pNode, FX_BOOL bNotify) {
             static_cast<CFDE_XMLElement*>(pNode->m_pXMLNode);
         CFX_WideStringC wsAttributeName =
             pNode->GetCData(XFA_ATTRIBUTE_QualifiedName);
-        pXMLElement->RemoveAttribute(wsAttributeName.raw_str());
+        pXMLElement->RemoveAttribute(wsAttributeName.c_str());
       }
       CFX_WideString wsName;
       pNode->GetAttribute(XFA_ATTRIBUTE_Name, wsName, FALSE);
@@ -4771,7 +4771,7 @@ FX_BOOL CXFA_Node::RemoveChild(CXFA_Node* pNode, FX_BOOL bNotify) {
 }
 CXFA_Node* CXFA_Node::GetFirstChildByName(const CFX_WideStringC& wsName) const {
   return GetFirstChildByName(
-      wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.raw_str(),
+      wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.c_str(),
                                                      wsName.GetLength()));
 }
 CXFA_Node* CXFA_Node::GetFirstChildByName(uint32_t dwNameHash) const {
@@ -4805,7 +4805,7 @@ CXFA_Node* CXFA_Node::GetNextSameNameSibling(
     const CFX_WideStringC& wsNodeName) const {
   return GetNextSameNameSibling(
       wsNodeName.IsEmpty() ? 0
-                           : FX_HashCode_String_GetW(wsNodeName.raw_str(),
+                           : FX_HashCode_String_GetW(wsNodeName.c_str(),
                                                      wsNodeName.GetLength()));
 }
 CXFA_Node* CXFA_Node::GetNextSameClassSibling(XFA_ELEMENT eElement) const {
@@ -4998,13 +4998,13 @@ void CXFA_Node::UpdateNameHash() {
   if (!pNotsure || pNotsure->eType == XFA_ATTRIBUTETYPE_Cdata) {
     CFX_WideStringC wsName = GetCData(XFA_ATTRIBUTE_Name);
     m_dwNameHash =
-        wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.raw_str(),
+        wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.c_str(),
                                                        wsName.GetLength());
   } else if (pNotsure->eType == XFA_ATTRIBUTETYPE_Enum) {
     CFX_WideStringC wsName =
         XFA_GetAttributeEnumByID(GetEnum(XFA_ATTRIBUTE_Name))->pName;
     m_dwNameHash =
-        wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.raw_str(),
+        wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.c_str(),
                                                        wsName.GetLength());
   }
 }
@@ -5050,7 +5050,7 @@ FX_BOOL CXFA_Node::GetMapModuleValue(void* pKey, void*& pValue) {
   return FALSE;
 }
 void CXFA_Node::SetMapModuleString(void* pKey, const CFX_WideStringC& wsValue) {
-  SetMapModuleBuffer(pKey, (void*)wsValue.raw_str(),
+  SetMapModuleBuffer(pKey, (void*)wsValue.c_str(),
                      wsValue.GetLength() * sizeof(FX_WCHAR));
 }
 FX_BOOL CXFA_Node::GetMapModuleString(void* pKey, CFX_WideStringC& wsValue) {
@@ -5279,7 +5279,7 @@ CXFA_NodeList::CXFA_NodeList(CXFA_Document* pDocument)
 CXFA_Node* CXFA_NodeList::NamedItem(const CFX_WideStringC& wsName) {
   int32_t iCount = GetLength();
   uint32_t dwHashCode =
-      FX_HashCode_String_GetW(wsName.raw_str(), wsName.GetLength());
+      FX_HashCode_String_GetW(wsName.c_str(), wsName.GetLength());
   for (int32_t i = 0; i < iCount; i++) {
     CXFA_Node* ret = Item(i);
     if (dwHashCode == ret->GetNameHash()) {
diff --git a/xfa/fxfa/parser/xfa_objectacc_imp.cpp b/xfa/fxfa/parser/xfa_objectacc_imp.cpp
index 22f8fc2b34..c0f281dc24 100644
--- a/xfa/fxfa/parser/xfa_objectacc_imp.cpp
+++ b/xfa/fxfa/parser/xfa_objectacc_imp.cpp
@@ -24,7 +24,7 @@ static FX_ARGB XFA_WStringToColor(const CFX_WideStringC& wsValue) {
     return 0xff000000;
   }
   int cc = 0;
-  const FX_WCHAR* str = wsValue.raw_str();
+  const FX_WCHAR* str = wsValue.c_str();
   int len = wsValue.GetLength();
   while (XFA_IsSpace(str[cc]) && cc < len) {
     cc++;
@@ -1239,7 +1239,7 @@ CXFA_Node* CXFA_WidgetData::SetSelectedMember(const CFX_WideStringC& wsName,
                                               FX_BOOL bNotify) {
   CXFA_Node* pSelectedMember = NULL;
   uint32_t nameHash =
-      FX_HashCode_String_GetW(wsName.raw_str(), wsName.GetLength());
+      FX_HashCode_String_GetW(wsName.c_str(), wsName.GetLength());
   for (CXFA_Node* pNode = ToNode(m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild));
        pNode; pNode = pNode->GetNodeItem(XFA_NODEITEM_NextSibling)) {
     if (pNode->GetNameHash() == nameHash) {
diff --git a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp
index 08e9cede92..c71384e130 100644
--- a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp
+++ b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp
@@ -416,7 +416,7 @@ static int32_t XFA_FilterName(const CFX_WideStringC& wsExpression,
   }
   FX_WCHAR* pBuf = wsFilter.GetBuffer(iLength - nStart);
   int32_t nCount = 0;
-  const FX_WCHAR* pSrc = wsExpression.raw_str();
+  const FX_WCHAR* pSrc = wsExpression.c_str();
   FX_WCHAR wCur;
   while (nStart < iLength) {
     wCur = pSrc[nStart++];
diff --git a/xfa/fxfa/parser/xfa_script_imp.cpp b/xfa/fxfa/parser/xfa_script_imp.cpp
index fe6caa84bc..0b5cb1d156 100644
--- a/xfa/fxfa/parser/xfa_script_imp.cpp
+++ b/xfa/fxfa/parser/xfa_script_imp.cpp
@@ -96,7 +96,7 @@ FX_BOOL CXFA_ScriptContext::RunScript(XFA_SCRIPTLANGTYPE eScriptType,
     btScript =
         FX_UTF8Encode(wsJavaScript.GetBuffer(), wsJavaScript.GetLength());
   } else {
-    btScript = FX_UTF8Encode(wsScript.raw_str(), wsScript.GetLength());
+    btScript = FX_UTF8Encode(wsScript.c_str(), wsScript.GetLength());
   }
   CXFA_Object* pOriginalObject = m_pThisObject;
   m_pThisObject = pThisObject;
@@ -466,7 +466,7 @@ FX_BOOL CXFA_ScriptContext::RunVariablesScript(CXFA_Node* pScriptNode) {
       return FALSE;
     }
     CFX_ByteString btScript =
-        FX_UTF8Encode(wsScript.raw_str(), wsScript.GetLength());
+        FX_UTF8Encode(wsScript.c_str(), wsScript.GetLength());
     FXJSE_HVALUE hRetValue = FXJSE_Value_Create(m_hJsRuntime);
     CXFA_Node* pThisObject = pParent->GetNodeItem(XFA_NODEITEM_Parent);
     FXJSE_HCONTEXT hVariablesContext =
diff --git a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
index 8ad8b13176..f86a65e712 100644
--- a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
+++ b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
@@ -538,7 +538,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_GetFilter(
   int32_t nConditionCount = 0;
   CFX_Int32Array stack;
   int32_t nType = -1;
-  const FX_WCHAR* pSrc = wsExpression.raw_str();
+  const FX_WCHAR* pSrc = wsExpression.c_str();
   FX_WCHAR wPrev = 0, wCur;
   FX_BOOL bIsCondition = FALSE;
   while (nStart < iLength) {