Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(613)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: xfa/fxfa/fm2js/xfa_fm2jscontext.cpp

Issue 1857073002: Make down-conversion explicit from CFX_Widetring to CFX_WideStringC. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Comment. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« xfa/fxfa/app/xfa_ffimageedit.cpp ('K') | « xfa/fxfa/app/xfa_textlayout.cpp ('k') | xfa/fxfa/parser/xfa_document_datamerger_imp.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
index 97eadbd3d5be16d8bbc6cc2b92ca74607f900a5c..af13ae7f7b3ae451ad9919491262b4414b2e2967 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
@@ -1589,7 +1589,8 @@ void CXFA_FM2JSContext::Time2Num(FXJSE_HOBJECT hThis,
pLocale = widgetData.GetLocal();
} else {
pLocale = pMgr->GetLocaleByName(
- CFX_WideString::FromUTF8(localString, localString.GetLength()));
+ CFX_WideString::FromUTF8(localString, localString.GetLength())
+ .AsWideStringC());
}
CFX_WideString wsFormat;
if (formatString.IsEmpty()) {
@@ -2039,7 +2040,8 @@ FX_BOOL CXFA_FM2JSContext::Local2IsoDate(FXJSE_HOBJECT hThis,
pLocale = widgetData.GetLocal();
} else {
pLocale = pMgr->GetLocaleByName(
- CFX_WideString::FromUTF8(szLocale.GetCStr(), szLocale.GetLength()));
+ CFX_WideString::FromUTF8(szLocale.GetCStr(), szLocale.GetLength())
+ .AsWideStringC());
}
if (!pLocale) {
return FALSE;
@@ -2079,7 +2081,8 @@ FX_BOOL CXFA_FM2JSContext::Local2IsoTime(FXJSE_HOBJECT hThis,
pLocale = widgetData.GetLocal();
} else {
pLocale = pMgr->GetLocaleByName(
- CFX_WideString::FromUTF8(szLocale.GetCStr(), szLocale.GetLength()));
+ CFX_WideString::FromUTF8(szLocale.GetCStr(), szLocale.GetLength())
+ .AsWideStringC());
}
if (!pLocale) {
return FALSE;
@@ -2122,7 +2125,8 @@ FX_BOOL CXFA_FM2JSContext::IsoDate2Local(FXJSE_HOBJECT hThis,
pLocale = widgetData.GetLocal();
} else {
pLocale = pMgr->GetLocaleByName(
- CFX_WideString::FromUTF8(szLocale.GetCStr(), szLocale.GetLength()));
+ CFX_WideString::FromUTF8(szLocale.GetCStr(), szLocale.GetLength())
+ .AsWideStringC());
}
if (!pLocale) {
return FALSE;
@@ -2164,7 +2168,8 @@ FX_BOOL CXFA_FM2JSContext::IsoTime2Local(FXJSE_HOBJECT hThis,
pLocale = widgetData.GetLocal();
} else {
pLocale = pMgr->GetLocaleByName(
- CFX_WideString::FromUTF8(szLocale.GetCStr(), szLocale.GetLength()));
+ CFX_WideString::FromUTF8(szLocale.GetCStr(), szLocale.GetLength())
+ .AsWideStringC());
}
if (!pLocale) {
return FALSE;
@@ -2208,7 +2213,8 @@ FX_BOOL CXFA_FM2JSContext::GetGMTTime(FXJSE_HOBJECT hThis,
pLocale = widgetData.GetLocal();
} else {
pLocale = pMgr->GetLocaleByName(
- CFX_WideString::FromUTF8(szLocale.GetCStr(), szLocale.GetLength()));
+ CFX_WideString::FromUTF8(szLocale.GetCStr(), szLocale.GetLength())
+ .AsWideStringC());
}
if (!pLocale) {
return FALSE;
@@ -2393,7 +2399,8 @@ void CXFA_FM2JSContext::GetLocalDateFormat(FXJSE_HOBJECT hThis,
pLocale = widgetData.GetLocal();
} else {
pLocale = pMgr->GetLocaleByName(
- CFX_WideString::FromUTF8(szLocalStr.GetCStr(), szLocalStr.GetLength()));
+ CFX_WideString::FromUTF8(szLocalStr.GetCStr(), szLocalStr.GetLength())
+ .AsWideStringC());
}
if (!pLocale) {
return;
@@ -2448,7 +2455,8 @@ void CXFA_FM2JSContext::GetLocalTimeFormat(FXJSE_HOBJECT hThis,
pLocale = widgetData.GetLocal();
} else {
pLocale = pMgr->GetLocaleByName(
- CFX_WideString::FromUTF8(szLocalStr.GetCStr(), szLocalStr.GetLength()));
+ CFX_WideString::FromUTF8(szLocalStr.GetCStr(), szLocalStr.GetLength())
+ .AsWideStringC());
}
if (!pLocale) {
return;
@@ -3267,8 +3275,9 @@ void CXFA_FM2JSContext::Eval(FXJSE_HOBJECT hThis,
CFX_WideTextBuf wsJavaScriptBuf;
CFX_WideString javaScript;
CFX_WideString wsError;
- XFA_FM2JS_Translate(CFX_WideString::FromUTF8(
- utf8ScriptString, utf8ScriptString.GetLength()),
+ XFA_FM2JS_Translate(CFX_WideString::FromUTF8(utf8ScriptString,
+ utf8ScriptString.GetLength())
+ .AsWideStringC(),
wsJavaScriptBuf, wsError);
FXJSE_HCONTEXT hContext = FXJSE_Context_Create(hruntime);
FXJSE_HVALUE returnValue = FXJSE_Value_Create(hruntime);
@@ -5491,7 +5500,8 @@ void CXFA_FM2JSContext::Get(FXJSE_HOBJECT hThis,
CFX_ByteString urlString;
HValueToUTF8String(argOne, urlString);
IFX_FileRead* pFile = pAppProvider->DownloadURL(
- CFX_WideString::FromUTF8(urlString, urlString.GetLength()));
+ CFX_WideString::FromUTF8(urlString, urlString.GetLength())
+ .AsWideStringC());
if (pFile) {
int32_t size = pFile->GetSize();
uint8_t* pData = FX_Alloc(uint8_t, size);
@@ -5551,11 +5561,14 @@ void CXFA_FM2JSContext::Post(FXJSE_HOBJECT hThis,
}
CFX_WideString decodedResponse;
FX_BOOL bFlags = pAppProvider->PostRequestURL(
- CFX_WideString::FromUTF8(bsURL, bsURL.GetLength()),
- CFX_WideString::FromUTF8(bsData, bsData.GetLength()),
- CFX_WideString::FromUTF8(bsContentType, bsContentType.GetLength()),
- CFX_WideString::FromUTF8(bsEncode, bsEncode.GetLength()),
- CFX_WideString::FromUTF8(bsHeader, bsHeader.GetLength()),
+ 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(),
decodedResponse);
FXJSE_Value_Release(argOne);
FXJSE_Value_Release(argTwo);
@@ -5612,9 +5625,10 @@ void CXFA_FM2JSContext::Put(FXJSE_HOBJECT hThis,
HValueToUTF8String(argThree, bsEncode);
}
FX_BOOL bFlags = pAppProvider->PutRequestURL(
- CFX_WideString::FromUTF8(bsURL, bsURL.GetLength()),
- CFX_WideString::FromUTF8(bsData, bsData.GetLength()),
- CFX_WideString::FromUTF8(bsEncode, bsEncode.GetLength()));
+ CFX_WideString::FromUTF8(bsURL, bsURL.GetLength()).AsWideStringC(),
+ CFX_WideString::FromUTF8(bsData, bsData.GetLength()).AsWideStringC(),
+ CFX_WideString::FromUTF8(bsEncode, bsEncode.GetLength())
+ .AsWideStringC());
FXJSE_Value_Release(argOne);
FXJSE_Value_Release(argTwo);
if (argc > 2) {
@@ -6420,7 +6434,8 @@ void CXFA_FM2JSContext::eval_translation(FXJSE_HOBJECT hThis,
CFX_WideString::FromUTF8(argString, argString.GetLength());
CFX_WideTextBuf wsJavaScriptBuf;
CFX_WideString wsError;
- XFA_FM2JS_Translate(scriptString, wsJavaScriptBuf, wsError);
+ XFA_FM2JS_Translate(scriptString.AsWideStringC(), wsJavaScriptBuf,
+ wsError);
if (wsError.IsEmpty()) {
CFX_WideString javaScript = wsJavaScriptBuf.GetWideString();
FXJSE_Value_SetUTF8String(
@@ -6889,7 +6904,8 @@ FX_BOOL CXFA_FM2JSContext::GetObjectByName(
int32_t iRet = pScriptContext->ResolveObjects(
pScriptContext->GetThisObject(),
CFX_WideString::FromUTF8(szAccessorName.GetCStr(),
- szAccessorName.GetLength()),
+ szAccessorName.GetLength())
+ .AsWideStringC(),
resoveNodeRS, dwFlags);
if (iRet >= 1 && resoveNodeRS.dwFlags == XFA_RESOVENODE_RSTYPE_Nodes) {
FXJSE_Value_Set(accessorValue, pScriptContext->GetJSValueFromMap(
@@ -6946,8 +6962,8 @@ int32_t CXFA_FM2JSContext::ResolveObjects(FXJSE_HOBJECT hThis,
pNode = (CXFA_Object*)FXJSE_Value_ToObject(hRefValue, NULL);
dFlags = XFA_RESOLVENODE_AnyChild;
}
- iRet = pScriptContext->ResolveObjects(pNode, wsSomExpression, resoveNodeRS,
- dFlags);
+ iRet = pScriptContext->ResolveObjects(pNode, wsSomExpression.AsWideStringC(),
+ resoveNodeRS, dFlags);
return iRet;
}
void CXFA_FM2JSContext::ParseResolveResult(
« xfa/fxfa/app/xfa_ffimageedit.cpp ('K') | « xfa/fxfa/app/xfa_textlayout.cpp ('k') | xfa/fxfa/parser/xfa_document_datamerger_imp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698