Make CFX_WideString::FromUTF8() take a CFX_ByteStringC argument.

xfa/fxfa/fm2js/xfa_fm2jscontext.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/fxfa/fm2js/xfa_fm2jscontext.h"
 
 #include <time.h>
 
@@ skipping 1074 matching lines @@
                                     CFXJSE_Arguments& args) {
   CXFA_FM2JSContext* pContext =
       (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
   if (args.GetLength() == 1) {
     FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
     if (HValueIsNull(hThis, argOne)) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       CXFA_Document* pDoc = pContext->GetDocument();
       FXSYS_assert(pDoc);
       IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();

[Lei Zhang, 2016/04/06 00:38:01]

BTW, there's a bunch of casts to IFX_LocaleMgr* and back to CXFA_LocaleMgr*.

[Tom Sepez, 2016/04/06 17:23:13]

Acknowledged.

       CFX_ByteString szArgString;
       HValueToUTF8String(argOne, szArgString);
       szArgString = szArgString.Mid(szArgString.Find('T', 0) + 1);
       if (szArgString.IsEmpty()) {
         FXJSE_Value_SetInteger(args.GetReturnValue(), 0);
         FXJSE_Value_Release(argOne);
         return;
       }
       CXFA_LocaleValue timeValue(
-          XFA_VT_TIME,
-          CFX_WideString::FromUTF8(szArgString, szArgString.GetLength()),
+          XFA_VT_TIME, CFX_WideString::FromUTF8(szArgString.AsByteStringC()),
           (CXFA_LocaleMgr*)pMgr);
       if (timeValue.IsValid()) {
         CFX_Unitime uniTime = timeValue.GetTime();
         int32_t hour = uniTime.GetHour();
         int32_t min = uniTime.GetMinute();
         int32_t second = uniTime.GetSecond();
         int32_t milSecond = uniTime.GetMillisecond();
         IFX_Locale* pDefLocale = pMgr->GetDefLocale();
         FXSYS_assert(pDefLocale);
         FX_TIMEZONE tzLocale;
@@ skipping 457 matching lines @@
       } else {
         HValueToUTF8String(localValue, localString);
       }
     }
     if (!bFlags) {
       CXFA_FM2JSContext* pContext =
           (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
       CXFA_Document* pDoc = pContext->GetDocument();
       IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
       IFX_Locale* pLocale = NULL;
       if (localString.IsEmpty()) {

[Lei Zhang, 2016/04/06 00:38:01]

And this block of code seems often repeated.

[Tom Sepez, 2016/04/06 17:23:13]

Acknowledged.

         CXFA_Node* pThisNode =
             ToNode(pDoc->GetScriptContext()->GetThisObject());
         FXSYS_assert(pThisNode);
         CXFA_WidgetData widgetData(pThisNode);
         pLocale = widgetData.GetLocal();
       } else {
         pLocale = pMgr->GetLocaleByName(
-            CFX_WideString::FromUTF8(localString, localString.GetLength())
+            CFX_WideString::FromUTF8(localString.AsByteStringC())
                 .AsWideStringC());
       }
       CFX_WideString wsFormat;
       if (formatString.IsEmpty()) {
         pLocale->GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY_Default, wsFormat);
       } else {
-        wsFormat =
-            CFX_WideString::FromUTF8(formatString, formatString.GetLength());
+        wsFormat = CFX_WideString::FromUTF8(formatString.AsByteStringC());
       }
       wsFormat = FX_WSTRC(L"time{") + wsFormat;
       wsFormat += FX_WSTRC(L"}");
       CXFA_LocaleValue timeValue(
-          XFA_VT_TIME,
-          CFX_WideString::FromUTF8(timeString, timeString.GetLength()),
+          XFA_VT_TIME, CFX_WideString::FromUTF8(timeString.AsByteStringC()),
           wsFormat, pLocale, (CXFA_LocaleMgr*)pMgr);
       if (timeValue.IsValid()) {
         CFX_Unitime uniTime = timeValue.GetTime();
         int32_t hour = uniTime.GetHour();
         int32_t min = uniTime.GetMinute();
         int32_t second = uniTime.GetSecond();
         int32_t milSecond = uniTime.GetMillisecond();
         int32_t mins = hour * 60 + min;
         CXFA_TimeZoneProvider* pProvider = CXFA_TimeZoneProvider::Get();
         if (pProvider) {
@@ skipping 416 matching lines @@
   }
   IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
   IFX_Locale* pLocale = NULL;
   if (szLocale.IsEmpty()) {
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     pLocale = widgetData.GetLocal();
   } else {
     pLocale = pMgr->GetLocaleByName(
-        CFX_WideString::FromUTF8(szLocale.c_str(), szLocale.GetLength())
-            .AsWideStringC());
+        CFX_WideString::FromUTF8(szLocale).AsWideStringC());
   }
   if (!pLocale) {
     return FALSE;
   }
   CFX_WideString wsFormat;
   if (szFormat.IsEmpty()) {
     pLocale->GetDatePattern(FX_LOCALEDATETIMESUBCATEGORY_Default, wsFormat);
   } else {
-    wsFormat = CFX_WideString::FromUTF8(szFormat.c_str(), szFormat.GetLength());
+    wsFormat = CFX_WideString::FromUTF8(szFormat);
   }
-  CXFA_LocaleValue widgetValue(
-      XFA_VT_DATE, CFX_WideString::FromUTF8(szDate.c_str(), szDate.GetLength()),
-      wsFormat, pLocale, (CXFA_LocaleMgr*)pMgr);
+  CXFA_LocaleValue widgetValue(XFA_VT_DATE, CFX_WideString::FromUTF8(szDate),
+                               wsFormat, pLocale, (CXFA_LocaleMgr*)pMgr);
   CFX_Unitime dt = widgetValue.GetDate();
   strIsoDate.Format("%4d-%02d-%02d", dt.GetYear(), dt.GetMonth(), dt.GetDay());
   return TRUE;
 }
 FX_BOOL CXFA_FM2JSContext::Local2IsoTime(FXJSE_HOBJECT hThis,
                                          const CFX_ByteStringC& szTime,
                                          const CFX_ByteStringC& szFormat,
                                          const CFX_ByteStringC& szLocale,
                                          CFX_ByteString& strIsoTime) {
   CXFA_FM2JSContext* pContext =
       (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
   CXFA_Document* pDoc = pContext->GetDocument();
   if (!pDoc) {
     return FALSE;
   }
   IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
   IFX_Locale* pLocale = NULL;
   if (szLocale.IsEmpty()) {
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     pLocale = widgetData.GetLocal();
   } else {
     pLocale = pMgr->GetLocaleByName(
-        CFX_WideString::FromUTF8(szLocale.c_str(), szLocale.GetLength())
-            .AsWideStringC());
+        CFX_WideString::FromUTF8(szLocale).AsWideStringC());
   }
   if (!pLocale) {
     return FALSE;
   }
   CFX_WideString wsFormat;
   if (szFormat.IsEmpty()) {
     pLocale->GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY_Default, wsFormat);
   } else {
-    wsFormat = CFX_WideString::FromUTF8(szFormat.c_str(), szFormat.GetLength());
+    wsFormat = CFX_WideString::FromUTF8(szFormat);
   }
   wsFormat = FX_WSTRC(L"time{") + wsFormat;
   wsFormat += FX_WSTRC(L"}");
-  CXFA_LocaleValue widgetValue(
-      XFA_VT_TIME, CFX_WideString::FromUTF8(szTime.c_str(), szTime.GetLength()),
-      wsFormat, pLocale, (CXFA_LocaleMgr*)pMgr);
+  CXFA_LocaleValue widgetValue(XFA_VT_TIME, CFX_WideString::FromUTF8(szTime),
+                               wsFormat, pLocale, (CXFA_LocaleMgr*)pMgr);
   CFX_Unitime utime = widgetValue.GetTime();
   strIsoTime.Format("%02d:%02d:%02d.%03d", utime.GetHour(), utime.GetMinute(),
                     utime.GetSecond(), utime.GetMillisecond());
   return TRUE;
 }
 FX_BOOL CXFA_FM2JSContext::IsoDate2Local(FXJSE_HOBJECT hThis,
                                          const CFX_ByteStringC& szDate,
                                          const CFX_ByteStringC& szFormat,
                                          const CFX_ByteStringC& szLocale,
                                          CFX_ByteString& strLocalDate) {
   CXFA_FM2JSContext* pContext =
       (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
   CXFA_Document* pDoc = pContext->GetDocument();
   if (!pDoc) {
     return FALSE;
   }
   IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
   IFX_Locale* pLocale = NULL;
   if (szLocale.IsEmpty()) {
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     pLocale = widgetData.GetLocal();
   } else {
     pLocale = pMgr->GetLocaleByName(
-        CFX_WideString::FromUTF8(szLocale.c_str(), szLocale.GetLength())
-            .AsWideStringC());
+        CFX_WideString::FromUTF8(szLocale).AsWideStringC());
   }
   if (!pLocale) {
     return FALSE;
   }
   CFX_WideString wsFormat;
   if (szFormat.IsEmpty()) {
     pLocale->GetDatePattern(FX_LOCALEDATETIMESUBCATEGORY_Default, wsFormat);
   } else {
-    wsFormat = CFX_WideString::FromUTF8(szFormat.c_str(), szFormat.GetLength());
+    wsFormat = CFX_WideString::FromUTF8(szFormat);
   }
-  CXFA_LocaleValue widgetValue(
-      XFA_VT_DATE, CFX_WideString::FromUTF8(szDate.c_str(), szDate.GetLength()),
-      (CXFA_LocaleMgr*)pMgr);
+  CXFA_LocaleValue widgetValue(XFA_VT_DATE, CFX_WideString::FromUTF8(szDate),
+                               (CXFA_LocaleMgr*)pMgr);
   CFX_WideString wsRet;
   widgetValue.FormatPatterns(wsRet, wsFormat, pLocale,
                              XFA_VALUEPICTURE_Display);
   strLocalDate = FX_UTF8Encode(wsRet, wsRet.GetLength());
   return TRUE;
 }
 FX_BOOL CXFA_FM2JSContext::IsoTime2Local(FXJSE_HOBJECT hThis,
                                          const CFX_ByteStringC& szTime,
                                          const CFX_ByteStringC& szFormat,
                                          const CFX_ByteStringC& szLocale,
                                          CFX_ByteString& strLocalTime) {
   CXFA_FM2JSContext* pContext =
       (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
   CXFA_Document* pDoc = pContext->GetDocument();
   if (!pDoc) {
     return FALSE;
   }
   IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
   IFX_Locale* pLocale = NULL;
   if (szLocale.IsEmpty()) {
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     pLocale = widgetData.GetLocal();
   } else {
     pLocale = pMgr->GetLocaleByName(
-        CFX_WideString::FromUTF8(szLocale.c_str(), szLocale.GetLength())
-            .AsWideStringC());
+        CFX_WideString::FromUTF8(szLocale).AsWideStringC());
   }
   if (!pLocale) {
     return FALSE;
   }
   CFX_WideString wsFormat;
   if (szFormat.IsEmpty()) {
     pLocale->GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY_Default, wsFormat);
   } else {
-    wsFormat = CFX_WideString::FromUTF8(szFormat.c_str(), szFormat.GetLength());
+    wsFormat = CFX_WideString::FromUTF8(szFormat);
   }
   wsFormat = FX_WSTRC(L"time{") + wsFormat;
   wsFormat += FX_WSTRC(L"}");
-  CXFA_LocaleValue widgetValue(
-      XFA_VT_TIME, CFX_WideString::FromUTF8(szTime.c_str(), szTime.GetLength()),
-      (CXFA_LocaleMgr*)pMgr);
+  CXFA_LocaleValue widgetValue(XFA_VT_TIME, CFX_WideString::FromUTF8(szTime),
+                               (CXFA_LocaleMgr*)pMgr);
   CFX_WideString wsRet;
   widgetValue.FormatPatterns(wsRet, wsFormat, pLocale,
                              XFA_VALUEPICTURE_Display);
   strLocalTime = FX_UTF8Encode(wsRet, wsRet.GetLength());
   return TRUE;
 }
 FX_BOOL CXFA_FM2JSContext::GetGMTTime(FXJSE_HOBJECT hThis,
                                       const CFX_ByteStringC& szTime,
                                       const CFX_ByteStringC& szFormat,
                                       const CFX_ByteStringC& szLocale,
                                       CFX_ByteString& strGMTTime) {
   CXFA_FM2JSContext* pContext =
       (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
   CXFA_Document* pDoc = pContext->GetDocument();
   if (!pDoc) {
     return FALSE;
   }
   IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
   IFX_Locale* pLocale = NULL;
   if (szLocale.IsEmpty()) {
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     pLocale = widgetData.GetLocal();
   } else {
     pLocale = pMgr->GetLocaleByName(
-        CFX_WideString::FromUTF8(szLocale.c_str(), szLocale.GetLength())
-            .AsWideStringC());
+        CFX_WideString::FromUTF8(szLocale).AsWideStringC());
   }
   if (!pLocale) {
     return FALSE;
   }
   CFX_WideString wsFormat;
   if (szFormat.IsEmpty()) {
     pLocale->GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY_Default, wsFormat);
   } else {
-    wsFormat = CFX_WideString::FromUTF8(szFormat.c_str(), szFormat.GetLength());
+    wsFormat = CFX_WideString::FromUTF8(szFormat);
   }
   wsFormat = FX_WSTRC(L"time{") + wsFormat;
   wsFormat += FX_WSTRC(L"}");
-  CXFA_LocaleValue widgetValue(
-      XFA_VT_TIME, CFX_WideString::FromUTF8(szTime.c_str(), szTime.GetLength()),
-      (CXFA_LocaleMgr*)pMgr);
+  CXFA_LocaleValue widgetValue(XFA_VT_TIME, CFX_WideString::FromUTF8(szTime),
+                               (CXFA_LocaleMgr*)pMgr);
   CFX_WideString wsRet;
   widgetValue.FormatPatterns(wsRet, wsFormat, pLocale,
                              XFA_VALUEPICTURE_Display);
   strGMTTime = FX_UTF8Encode(wsRet, wsRet.GetLength());
   return TRUE;
 }
 int32_t CXFA_FM2JSContext::DateString2Num(const CFX_ByteStringC& szDateString) {
   FX_BOOL bFlags = FALSE;
   int32_t iLength = szDateString.GetLength();
   FX_BOOL iRet = FALSE;
@@ skipping 147 matching lines @@
   }
   IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
   IFX_Locale* pLocale = NULL;
   if (szLocalStr.IsEmpty()) {
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     pLocale = widgetData.GetLocal();
   } else {
     pLocale = pMgr->GetLocaleByName(
-        CFX_WideString::FromUTF8(szLocalStr.c_str(), szLocalStr.GetLength())
-            .AsWideStringC());
+        CFX_WideString::FromUTF8(szLocalStr).AsWideStringC());
   }
   if (!pLocale) {
     return;
   }
   CFX_WideString strRet;
   pLocale->GetDatePattern(strStyle, strRet);
   if (!bStandard) {
     CFX_WideString wsSymbols;
     pLocale->GetDateTimeSymbols(wsSymbols);
     XFA_FM_AlternateDateTimeSymbols(strRet, wsSymbols, g_sAltTable_Date);
@@ skipping 34 matching lines @@
   }
   IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
   IFX_Locale* pLocale = NULL;
   if (szLocalStr.IsEmpty()) {
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     pLocale = widgetData.GetLocal();
   } else {
     pLocale = pMgr->GetLocaleByName(
-        CFX_WideString::FromUTF8(szLocalStr.c_str(), szLocalStr.GetLength())
-            .AsWideStringC());
+        CFX_WideString::FromUTF8(szLocalStr).AsWideStringC());
   }
   if (!pLocale) {
     return;
   }
   CFX_WideString strRet;
   pLocale->GetTimePattern(strStyle, strRet);
   if (!bStandard) {
     CFX_WideString wsSymbols;
     pLocale->GetDateTimeSymbols(wsSymbols);
     XFA_FM_AlternateDateTimeSymbols(strRet, wsSymbols, g_sAltTable_Time);
@@ skipping 798 matching lines @@
   if (args.GetLength() == 1) {
     FXJSE_HVALUE scriptValue = GetSimpleHValue(hThis, args, 0);
     CFX_ByteString utf8ScriptString;
     HValueToUTF8String(scriptValue, utf8ScriptString);
     if (utf8ScriptString.IsEmpty()) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       CFX_WideTextBuf wsJavaScriptBuf;
       CFX_WideString javaScript;
       CFX_WideString wsError;
-      XFA_FM2JS_Translate(CFX_WideString::FromUTF8(utf8ScriptString,
-                                                   utf8ScriptString.GetLength())
-                              .AsWideStringC(),
-                          wsJavaScriptBuf, wsError);
+      XFA_FM2JS_Translate(
+          CFX_WideString::FromUTF8(utf8ScriptString.AsByteStringC())
+              .AsWideStringC(),
+          wsJavaScriptBuf, wsError);
       FXJSE_HCONTEXT hContext = FXJSE_Context_Create(hruntime);
       FXJSE_HVALUE returnValue = FXJSE_Value_Create(hruntime);
       javaScript = wsJavaScriptBuf.GetWideString();
       FXJSE_ExecuteScript(hContext,
                           FX_UTF8Encode(javaScript, javaScript.GetLength()),
                           returnValue);
       FXJSE_Value_Set(args.GetReturnValue(), returnValue);
       FXJSE_Value_Release(returnValue);
       FXJSE_Context_Release(hContext);
     }
@@ skipping 100 matching lines @@
         VALUETYPE_HAVEDIGIT,
         VALUETYPE_HAVEDIGITWHITE,
         VALUETYPE_ISCM,
         VALUETYPE_ISMM,
         VALUETYPE_ISPT,
         VALUETYPE_ISMP,
         VALUETYPE_ISIN,
       };
       unitspanString.MakeLower();
       CFX_WideString wsTypeString =
-          CFX_WideString::FromUTF8(unitspanString, unitspanString.GetLength());
+          CFX_WideString::FromUTF8(unitspanString.AsByteStringC());
       const FX_WCHAR* pData = wsTypeString;
       int32_t u = 0;
       int32_t uLen = wsTypeString.GetLength();
       while (*(pData + u) == 0x20 || *(pData + u) == 0x09 ||
              *(pData + u) == 0x0B || *(pData + u) == 0x0C ||
              *(pData + u) == 0x0A || *(pData + u) == 0x0D) {
         u++;
       }
       XFA_FM2JS_VALUETYPE_ParserStatus eParserStatus = VALUETYPE_START;
       FX_WCHAR typeChar;
@@ skipping 339 matching lines @@
     }
     FXJSE_Value_Release(argOne);
     FXJSE_Value_Release(argTwo);
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Decode");
   }
 }
 void CXFA_FM2JSContext::DecodeURL(const CFX_ByteStringC& szURLString,
                                   CFX_ByteTextBuf& szResultString) {
-  CFX_WideString wsURLString =
-      CFX_WideString::FromUTF8(szURLString.c_str(), szURLString.GetLength());
+  CFX_WideString wsURLString = CFX_WideString::FromUTF8(szURLString);
   const FX_WCHAR* pData = wsURLString;
   int32_t iLen = wsURLString.GetLength();
   int32_t i = 0;
   FX_WCHAR ch = 0;
   FX_WCHAR chTemp = 0;
   CFX_WideTextBuf wsResultBuf;
   while (i < iLen) {
     ch = *(pData + i);
     if ('%' == ch) {
       chTemp = 0;
@@ skipping 34 matching lines @@
     ++i;
   }
   wsResultBuf.AppendChar(0);
   szResultString.Clear();
   szResultString << FX_UTF8Encode(wsResultBuf.GetBuffer(),
                                   wsResultBuf.GetLength())
                         .AsByteStringC();
 }
 void CXFA_FM2JSContext::DecodeHTML(const CFX_ByteStringC& szHTMLString,
                                    CFX_ByteTextBuf& szResultString) {
-  CFX_WideString wsHTMLString =
-      CFX_WideString::FromUTF8(szHTMLString.c_str(), szHTMLString.GetLength());
+  CFX_WideString wsHTMLString = CFX_WideString::FromUTF8(szHTMLString);
   FX_WCHAR strString[9];
   int32_t iStrIndex = 0;
   int32_t iLen = wsHTMLString.GetLength();
   int32_t i = 0;
   int32_t iCode = 0;
   FX_WCHAR ch = 0;
   const FX_WCHAR* pData = wsHTMLString;
   CFX_WideTextBuf wsResultBuf;
   while (i < iLen) {
     ch = *(pData + i);
@@ skipping 53 matching lines @@
     ++i;
   }
   wsResultBuf.AppendChar(0);
   szResultString.Clear();
   szResultString << FX_UTF8Encode(wsResultBuf.GetBuffer(),
                                   wsResultBuf.GetLength())
                         .AsByteStringC();
 }
 void CXFA_FM2JSContext::DecodeXML(const CFX_ByteStringC& szXMLString,
                                   CFX_ByteTextBuf& szResultString) {
-  CFX_WideString wsXMLString =
-      CFX_WideString::FromUTF8(szXMLString.c_str(), szXMLString.GetLength());
+  CFX_WideString wsXMLString = CFX_WideString::FromUTF8(szXMLString);
   FX_WCHAR strString[9];
   int32_t iStrIndex = 0;
   int32_t iLen = wsXMLString.GetLength();
   int32_t i = 0;
   int32_t iCode = 0;
   FX_WCHAR ch = 0;
   const FX_WCHAR* pData = wsXMLString;
   CFX_WideTextBuf wsXMLBuf;
   while (i < iLen) {
     ch = *(pData + i);
@@ skipping 123 matching lines @@
     }
     FXJSE_Value_Release(argOne);
     FXJSE_Value_Release(argTwo);
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Encode");
   }
 }
 void CXFA_FM2JSContext::EncodeURL(const CFX_ByteStringC& szURLString,
                                   CFX_ByteTextBuf& szResultBuf) {
-  CFX_WideString wsURLString =
-      CFX_WideString::FromUTF8(szURLString.c_str(), szURLString.GetLength());
+  CFX_WideString wsURLString = CFX_WideString::FromUTF8(szURLString);
   CFX_WideTextBuf wsResultBuf;
   FX_WCHAR ch = 0;
   int32_t iLength = wsURLString.GetLength();
   FX_WCHAR strEncode[4];
   strEncode[0] = '%';
   strEncode[3] = 0;
   FX_WCHAR strUnsafe[] = {' ', '<',  '>', '"', '#', '%', '{', '}',
                           '|', '\\', '^', '~', '[', ']', '`'};
   FX_WCHAR strReserved[] = {';', '/', '?', ':', '@', '=', '&'};
   FX_WCHAR strSpecial[] = {'$', '-', '+', '!', '*', '\'', '(', ')', ','};
@@ skipping 87 matching lines @@
     }
   }
   wsResultBuf.AppendChar(0);
   szResultBuf.Clear();
   szResultBuf << FX_UTF8Encode(wsResultBuf.GetBuffer(), wsResultBuf.GetLength())
                      .AsByteStringC();
 }
 void CXFA_FM2JSContext::EncodeHTML(const CFX_ByteStringC& szHTMLString,
                                    CFX_ByteTextBuf& szResultBuf) {
   CFX_ByteString str = szHTMLString.c_str();
-  CFX_WideString wsHTMLString = CFX_WideString::FromUTF8(str, str.GetLength());
+  CFX_WideString wsHTMLString = CFX_WideString::FromUTF8(str.AsByteStringC());
   const FX_WCHAR* strCode = L"0123456789abcdef";
   FX_WCHAR strEncode[9];
   strEncode[0] = '&';
   strEncode[1] = '#';
   strEncode[2] = 'x';
   strEncode[5] = ';';
   strEncode[6] = 0;
   strEncode[7] = ';';
   strEncode[8] = 0;
   CFX_WideTextBuf wsResultBuf;
@@ skipping 32 matching lines @@
     }
     ++i;
   }
   wsResultBuf.AppendChar(0);
   szResultBuf.Clear();
   szResultBuf << FX_UTF8Encode(wsResultBuf.GetBuffer(), wsResultBuf.GetLength())
                      .AsByteStringC();
 }
 void CXFA_FM2JSContext::EncodeXML(const CFX_ByteStringC& szXMLString,
                                   CFX_ByteTextBuf& szResultBuf) {
-  CFX_WideString wsXMLString =
-      CFX_WideString::FromUTF8(szXMLString.c_str(), szXMLString.GetLength());
+  CFX_WideString wsXMLString = CFX_WideString::FromUTF8(szXMLString);
   CFX_WideTextBuf wsResultBuf;
   enum {
     QUOT,
     AMP,
     APOS,
     LT,
     GT,
   };
   FX_WCHAR strEncode[9];
   strEncode[0] = '&';
@@ skipping 102 matching lines @@
     } else if (iCode < htmlreservecode.m_uCode) {
       iEnd = iMid - 1;
     } else {
       iStart = iMid + 1;
     }
   } while (iStart <= iEnd);
   return FALSE;
 }
 static FX_BOOL XFA_PATTERN_STRING_Type(const CFX_ByteStringC& szPattern,
                                        uint32_t& patternType) {
-  CFX_WideString wsPattern =
-      CFX_WideString::FromUTF8(szPattern.c_str(), szPattern.GetLength());
+  CFX_WideString wsPattern = CFX_WideString::FromUTF8(szPattern);
   if (FX_WSTRC(L"datetime") == wsPattern.Left(8)) {
     patternType = XFA_VT_DATETIME;
     return TRUE;
   } else if (FX_WSTRC(L"date") == wsPattern.Left(4)) {
     patternType = wsPattern.Find(L"time") > 0 ? XFA_VT_DATETIME : XFA_VT_DATE;
     return TRUE;
   } else if (FX_WSTRC(L"time") == wsPattern.Left(4)) {
     patternType = XFA_VT_TIME;
     return TRUE;
   } else if (FX_WSTRC(L"text") == wsPattern.Left(4)) {
@@ skipping 84 matching lines @@
     CXFA_Document* pDoc = pContext->GetDocument();
     IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     IFX_Locale* pLocale = widgetData.GetLocal();
     uint32_t patternType;
     FX_BOOL bCompelte =
         XFA_PATTERN_STRING_Type(szPattern.AsByteStringC(), patternType);
     CFX_WideString wsPattern =
-        CFX_WideString::FromUTF8(szPattern, szPattern.GetLength());
-    CFX_WideString wsValue =
-        CFX_WideString::FromUTF8(szValue, szValue.GetLength());
+        CFX_WideString::FromUTF8(szPattern.AsByteStringC());
+    CFX_WideString wsValue = CFX_WideString::FromUTF8(szValue.AsByteStringC());
     if (!bCompelte) {
       switch (patternType) {
         case XFA_VT_DATETIME: {
           FX_STRSIZE iTChar = wsPattern.Find(L'T');
           CFX_WideString wsDatePattern = FX_WSTRC(L"date{");
           wsDatePattern += wsPattern.Left(iTChar);
           wsDatePattern += FX_WSTRC(L"} ");
           CFX_WideString wsTimePattern = FX_WSTRC(L"time{");
           wsTimePattern += wsPattern.Mid(iTChar + 1);
           wsTimePattern += FX_WSTRC(L"}");
@@ skipping 112 matching lines @@
     FXJSE_HVALUE localeValue = 0;
     if (HValueIsNull(hThis, argOne)) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       if (argc == 2) {
         localeValue = GetSimpleHValue(hThis, args, 1);
       }
       HValueToUTF8String(argOne, argString);
       CFX_WideTextBuf lowStringBuf;
       CFX_WideString wsArgString =
-          CFX_WideString::FromUTF8(argString, argString.GetLength());
+          CFX_WideString::FromUTF8(argString.AsByteStringC());
       const FX_WCHAR* pData = wsArgString;
       int32_t iLen = argString.GetLength();
       int32_t i = 0;
       int32_t ch = 0;
       while (i < iLen) {
         ch = *(pData + i);
         if (ch >= 0x41 && ch <= 0x5A) {
           ch += 32;
         } else if (ch >= 0xC0 && ch <= 0xDE) {
           ch += 32;
@@ skipping 60 matching lines @@
       CXFA_Document* pDoc = pContext->GetDocument();
       IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
       CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
       FXSYS_assert(pThisNode);
       CXFA_WidgetData widgetData(pThisNode);
       IFX_Locale* pLocale = widgetData.GetLocal();
       uint32_t patternType;
       FX_BOOL bCompletePattern =
           XFA_PATTERN_STRING_Type(szPattern.AsByteStringC(), patternType);
       CFX_WideString wsPattern =
-          CFX_WideString::FromUTF8(szPattern, szPattern.GetLength());
+          CFX_WideString::FromUTF8(szPattern.AsByteStringC());
       CFX_WideString wsValue =
-          CFX_WideString::FromUTF8(szValue, szValue.GetLength());
+          CFX_WideString::FromUTF8(szValue.AsByteStringC());
       CFX_ByteString szParsedValue;
       if (bCompletePattern) {
         CXFA_LocaleValue localeValue(patternType, wsValue, wsPattern, pLocale,
                                      (CXFA_LocaleMgr*)pMgr);
         if (localeValue.IsValid()) {
           szParsedValue = FX_UTF8Encode(localeValue.GetValue());
           FXJSE_Value_SetUTF8String(args.GetReturnValue(),
                                     szParsedValue.AsByteStringC());
         } else {
           FXJSE_Value_SetUTF8String(args.GetReturnValue(), "");
@@ skipping 524 matching lines @@
     FXJSE_HVALUE localeValue = 0;
     if (HValueIsNull(hThis, argOne)) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       if (argc == 2) {
         localeValue = GetSimpleHValue(hThis, args, 1);
       }
       HValueToUTF8String(argOne, argString);
       CFX_WideTextBuf upperStringBuf;
       CFX_WideString wsArgString =
-          CFX_WideString::FromUTF8(argString, argString.GetLength());
+          CFX_WideString::FromUTF8(argString.AsByteStringC());
       const FX_WCHAR* pData = wsArgString;
       int32_t iLen = wsArgString.GetLength();
       int32_t i = 0;
       int32_t ch = 0;
       while (i < iLen) {
         ch = *(pData + i);
         if (ch >= 0x61 && ch <= 0x7A) {
           ch -= 32;
         } else if (ch >= 0xE0 && ch <= 0xFE) {
           ch -= 32;
@@ skipping 289 matching lines @@
     }
     IXFA_AppProvider* pAppProvider =
         pDoc->GetParser()->GetNotify()->GetAppProvider();
     if (!pAppProvider) {
       return;
     }
     FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
     CFX_ByteString urlString;
     HValueToUTF8String(argOne, urlString);
     IFX_FileRead* pFile = pAppProvider->DownloadURL(
-        CFX_WideString::FromUTF8(urlString, urlString.GetLength())
-            .AsWideStringC());
+        CFX_WideString::FromUTF8(urlString.AsByteStringC()).AsWideStringC());
     if (pFile) {
       int32_t size = pFile->GetSize();
       uint8_t* pData = FX_Alloc(uint8_t, size);
       pFile->ReadBlock(pData, size);
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
                                 CFX_ByteStringC(pData, size));
       FX_Free(pData);
       pFile->Release();
     }
     FXJSE_Value_Release(argOne);
@@ skipping 39 matching lines @@
     if (argc > 3) {
       argFour = GetSimpleHValue(hThis, args, 3);
       HValueToUTF8String(argFour, bsEncode);
     }
     if (argc > 4) {
       argFive = GetSimpleHValue(hThis, args, 4);
       HValueToUTF8String(argFive, bsHeader);
     }
     CFX_WideString decodedResponse;
     FX_BOOL bFlags = pAppProvider->PostRequestURL(
-        CFX_WideString::FromUTF8(bsURL, bsURL.GetLength()).AsWideStringC(),
-        CFX_WideString::FromUTF8(bsData, bsData.GetLength()).AsWideStringC(),
-        CFX_WideString::FromUTF8(bsContentType, bsContentType.GetLength())
-            .AsWideStringC(),
-        CFX_WideString::FromUTF8(bsEncode, bsEncode.GetLength())
-            .AsWideStringC(),
-        CFX_WideString::FromUTF8(bsHeader, bsHeader.GetLength())
-            .AsWideStringC(),
+        CFX_WideString::FromUTF8(bsURL.AsByteStringC()).AsWideStringC(),
+        CFX_WideString::FromUTF8(bsData.AsByteStringC()).AsWideStringC(),
+        CFX_WideString::FromUTF8(bsContentType.AsByteStringC()).AsWideStringC(),
+        CFX_WideString::FromUTF8(bsEncode.AsByteStringC()).AsWideStringC(),
+        CFX_WideString::FromUTF8(bsHeader.AsByteStringC()).AsWideStringC(),
         decodedResponse);
     FXJSE_Value_Release(argOne);
     FXJSE_Value_Release(argTwo);
     if (argc > 2) {
       FXJSE_Value_Release(argThree);
     }
     if (argc > 3) {
       FXJSE_Value_Release(argFour);
     }
     if (argc > 4) {
@@ skipping 36 matching lines @@
     FXJSE_HVALUE argThree;
     argOne = GetSimpleHValue(hThis, args, 0);
     HValueToUTF8String(argOne, bsURL);
     argTwo = GetSimpleHValue(hThis, args, 1);
     HValueToUTF8String(argTwo, bsData);
     if (argc > 2) {
       argThree = GetSimpleHValue(hThis, args, 2);
       HValueToUTF8String(argThree, bsEncode);
     }
     FX_BOOL bFlags = pAppProvider->PutRequestURL(
-        CFX_WideString::FromUTF8(bsURL, bsURL.GetLength()).AsWideStringC(),
-        CFX_WideString::FromUTF8(bsData, bsData.GetLength()).AsWideStringC(),
-        CFX_WideString::FromUTF8(bsEncode, bsEncode.GetLength())
-            .AsWideStringC());
+        CFX_WideString::FromUTF8(bsURL.AsByteStringC()).AsWideStringC(),
+        CFX_WideString::FromUTF8(bsData.AsByteStringC()).AsWideStringC(),
+        CFX_WideString::FromUTF8(bsEncode.AsByteStringC()).AsWideStringC());
     FXJSE_Value_Release(argOne);
     FXJSE_Value_Release(argTwo);
     if (argc > 2) {
       FXJSE_Value_Release(argThree);
     }
     if (bFlags) {
       FXJSE_Value_SetUTF8String(args.GetReturnValue(), "");
     } else {
       pContext->ThrowScriptErrorMessage(XFA_IDS_SERVER_DENY);
     }
@@ skipping 542 matching lines @@
             iIndex++;
           }
         }
         FXJSE_Value_SetArray(args.GetReturnValue(), (iCounter + 2), rgValues);
         for (int32_t i = 0; i < (iCounter + 2); i++) {
           FXJSE_Value_Release(rgValues[i]);
         }
         FX_Free(rgValues);
       } else {
         CFX_WideString wsPropertyName =
-            CFX_WideString::FromUTF8(szName, szName.GetLength());
+            CFX_WideString::FromUTF8(szName.AsByteStringC());
         CFX_WideString wsSomExpression =
-            CFX_WideString::FromUTF8(szSomExp, szSomExp.GetLength());
+            CFX_WideString::FromUTF8(szSomExp.AsByteStringC());
         pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT,
                                           (const FX_WCHAR*)wsPropertyName,
                                           (const FX_WCHAR*)wsSomExpression);
       }
       for (int32_t i = 0; i < iLength - 2; i++) {
         for (int32_t j = 0; j < iSizes[i]; j++) {
           FXJSE_Value_Release(hResolveValues[i][j]);
         }
         if (iSizes[i] > 0) {
           FX_Free(hResolveValues[i]);
@@ skipping 40 matching lines @@
         for (int32_t i = 0; i < (iSize + 2); i++) {
           FXJSE_Value_Release(rgValues[i]);
         }
         FX_Free(rgValues);
         for (int32_t i = 0; i < iSize; i++) {
           FXJSE_Value_Release(hResolveValues[i]);
         }
         FX_Free(hResolveValues);
       } else {
         CFX_WideString wsPropertyName =
-            CFX_WideString::FromUTF8(szName, szName.GetLength());
+            CFX_WideString::FromUTF8(szName.AsByteStringC());
         CFX_WideString wsSomExpression =
-            CFX_WideString::FromUTF8(szSomExp, szSomExp.GetLength());
+            CFX_WideString::FromUTF8(szSomExp.AsByteStringC());
         pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT,
                                           (const FX_WCHAR*)wsPropertyName,
                                           (const FX_WCHAR*)wsSomExpression);
       }
     }
     if (argc == 5) {
       FXJSE_Value_Release(argIndex);
     }
     FXJSE_Value_Release(argAccessor);
   } else {
@@ skipping 62 matching lines @@
             iIndex++;
           }
         }
         FXJSE_Value_SetArray(args.GetReturnValue(), (iCounter + 2), rgValues);
         for (int32_t i = 0; i < (iCounter + 2); i++) {
           FXJSE_Value_Release(rgValues[i]);
         }
         FX_Free(rgValues);
       } else {
         CFX_WideString wsPropertyName =
-            CFX_WideString::FromUTF8(szName, szName.GetLength());
+            CFX_WideString::FromUTF8(szName.AsByteStringC());
         CFX_WideString wsSomExpression =
-            CFX_WideString::FromUTF8(szSomExp, szSomExp.GetLength());
+            CFX_WideString::FromUTF8(szSomExp.AsByteStringC());
         pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT,
                                           (const FX_WCHAR*)wsPropertyName,
                                           (const FX_WCHAR*)wsSomExpression);
       }
       for (int32_t i = 0; i < iLength - 2; i++) {
         for (int32_t j = 0; j < iSizes[i]; j++) {
           FXJSE_Value_Release(hResolveValues[i][j]);
         }
         FX_Free(hResolveValues[i]);
       }
@@ skipping 39 matching lines @@
         for (int32_t i = 0; i < (iSize + 2); i++) {
           FXJSE_Value_Release(rgValues[i]);
         }
         FX_Free(rgValues);
         for (int32_t i = 0; i < iSize; i++) {
           FXJSE_Value_Release(hResolveValues[i]);
         }
         FX_Free(hResolveValues);
       } else {
         CFX_WideString wsPropertyName =
-            CFX_WideString::FromUTF8(szName, szName.GetLength());
+            CFX_WideString::FromUTF8(szName.AsByteStringC());
         CFX_WideString wsSomExpression =
-            CFX_WideString::FromUTF8(szSomExp, szSomExp.GetLength());
+            CFX_WideString::FromUTF8(szSomExp.AsByteStringC());
         pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT,
                                           (const FX_WCHAR*)wsPropertyName,
                                           (const FX_WCHAR*)wsSomExpression);
       }
     }
     if (argc == 5) {
       FXJSE_Value_Release(argIndex);
     }
     FXJSE_Value_Release(argAccessor);
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_COMPILER_ERROR);
   }
 }
 void CXFA_FM2JSContext::eval_translation(FXJSE_HOBJECT hThis,
                                          const CFX_ByteStringC& szFuncName,
                                          CFXJSE_Arguments& args) {
   CXFA_FM2JSContext* pContext =
       (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
   int32_t argc = args.GetLength();
   if (argc == 1) {
     FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
     CFX_ByteString argString;
     HValueToUTF8String(argOne, argString);
     if (argString.IsEmpty()) {
       pContext->ThrowScriptErrorMessage(XFA_IDS_ARGUMENT_MISMATCH);
     } else {
       CFX_WideString scriptString =
-          CFX_WideString::FromUTF8(argString, argString.GetLength());
+          CFX_WideString::FromUTF8(argString.AsByteStringC());
       CFX_WideTextBuf wsJavaScriptBuf;
       CFX_WideString wsError;
       XFA_FM2JS_Translate(scriptString.AsWideStringC(), wsJavaScriptBuf,
                           wsError);
       if (wsError.IsEmpty()) {
         CFX_WideString javaScript = wsJavaScriptBuf.GetWideString();
         FXJSE_Value_SetUTF8String(
             args.GetReturnValue(),
             FX_UTF8Encode(javaScript, javaScript.GetLength()).AsByteStringC());
       } else {
@@ skipping 451 matching lines @@
   CXFA_Document* pDoc = pContext->GetDocument();
   if (!pDoc) {
     return bFlags;
   }
   CXFA_ScriptContext* pScriptContext = pDoc->GetScriptContext();
   XFA_RESOLVENODE_RS resoveNodeRS;
   uint32_t dwFlags = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
                      XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_Parent;
   int32_t iRet = pScriptContext->ResolveObjects(
       pScriptContext->GetThisObject(),
-      CFX_WideString::FromUTF8(szAccessorName.c_str(),
-                               szAccessorName.GetLength())
-          .AsWideStringC(),
-      resoveNodeRS, dwFlags);
+      CFX_WideString::FromUTF8(szAccessorName).AsWideStringC(), resoveNodeRS,
+      dwFlags);
   if (iRet >= 1 && resoveNodeRS.dwFlags == XFA_RESOVENODE_RSTYPE_Nodes) {
     FXJSE_Value_Set(accessorValue, pScriptContext->GetJSValueFromMap(
                                        resoveNodeRS.nodes.GetAt(0)));
     bFlags = TRUE;
   }
   return bFlags;
 }
 int32_t CXFA_FM2JSContext::ResolveObjects(FXJSE_HOBJECT hThis,
                                           FXJSE_HVALUE hRefValue,
                                           const CFX_ByteStringC& bsSomExp,
                                           XFA_RESOLVENODE_RS& resoveNodeRS,
                                           FX_BOOL bdotAccessor,
                                           FX_BOOL bHasNoResolveName) {
-  CFX_WideString wsSomExpression =
-      CFX_WideString::FromUTF8(bsSomExp.c_str(), bsSomExp.GetLength());
+  CFX_WideString wsSomExpression = CFX_WideString::FromUTF8(bsSomExp);
   int32_t iRet = -1;
   CXFA_FM2JSContext* pContext =
       (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
   CXFA_Document* pDoc = pContext->GetDocument();
   if (!pDoc) {
     return iRet;
   }
   CXFA_ScriptContext* pScriptContext = pDoc->GetScriptContext();
   CXFA_Object* pNode = NULL;
   uint32_t dFlags = 0UL;
@@ skipping 347 matching lines @@
   CFX_WideString wsFormat;
   pAppProvider->LoadString(iStringID, wsFormat);
   CFX_WideString wsMessage;
   va_list arg_ptr;
   va_start(arg_ptr, iStringID);
   wsMessage.FormatV((const FX_WCHAR*)wsFormat, arg_ptr);
   va_end(arg_ptr);
   FXJSE_ThrowMessage(
       "", FX_UTF8Encode(wsMessage, wsMessage.GetLength()).AsByteStringC());
 }