From 28f97ff783c16f3391384ce97b765ce4eb310ac7 Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Mon, 4 Apr 2016 16:41:35 -0700
Subject: Make down-conversion explicit from CFX_ByteString to CFX_ByteStringC.

Having this happen implicitly can be dangerous because the lifetime
has to be considered; we should have caught the "red bots" in
https://codereview.chromium.org/1847333004/#ps60001 at compile time.

Review URL: https://codereview.chromium.org/1853233002
---
 xfa/fxfa/app/xfa_checksum.cpp   | 2 +-
 xfa/fxfa/app/xfa_fftextedit.cpp | 6 +++---
 xfa/fxfa/app/xfa_fontmgr.cpp    | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'xfa/fxfa/app')

diff --git a/xfa/fxfa/app/xfa_checksum.cpp b/xfa/fxfa/app/xfa_checksum.cpp
index aac5456b63..c76ec505e9 100644
--- a/xfa/fxfa/app/xfa_checksum.cpp
+++ b/xfa/fxfa/app/xfa_checksum.cpp
@@ -73,7 +73,7 @@ void CXFA_SAXReaderHandler::OnTagClose(void* pTag, uint32_t dwEndPos) {
   if (pSAXContext->m_eNode == FX_SAXNODE_Instruction) {
     textBuf << "?>";
   } else if (pSAXContext->m_eNode == FX_SAXNODE_Tag) {
-    textBuf << "></" << pSAXContext->m_bsTagName << ">";
+    textBuf << "></" << pSAXContext->m_bsTagName.AsByteStringC() << ">";
   }
   UpdateChecksum(FALSE);
 }
diff --git a/xfa/fxfa/app/xfa_fftextedit.cpp b/xfa/fxfa/app/xfa_fftextedit.cpp
index 085ec07d9f..fa530169e0 100644
--- a/xfa/fxfa/app/xfa_fftextedit.cpp
+++ b/xfa/fxfa/app/xfa_fftextedit.cpp
@@ -420,13 +420,13 @@ FWL_ERR CXFA_FFTextEdit::OnProcessEvent(CFWL_Event* pEvent) {
     case FWL_EVTHASH_EDT_CheckWord: {
       CFX_WideString wstr(L"FWL_EVENT_DTP_SelectChanged");
       CFWL_EvtEdtCheckWord* event = (CFWL_EvtEdtCheckWord*)pEvent;
-      event->bCheckWord = CheckWord(event->bsWord);
+      event->bCheckWord = CheckWord(event->bsWord.AsByteStringC());
       break;
     }
     case FWL_EVTHASH_EDT_GetSuggestWords: {
       CFWL_EvtEdtGetSuggestWords* event = (CFWL_EvtEdtGetSuggestWords*)pEvent;
-      event->bSuggestWords =
-          GetSuggestWords(event->bsWord, event->bsArraySuggestWords);
+      event->bSuggestWords = GetSuggestWords(event->bsWord.AsByteStringC(),
+                                             event->bsArraySuggestWords);
       break;
     }
     default: {}
diff --git a/xfa/fxfa/app/xfa_fontmgr.cpp b/xfa/fxfa/app/xfa_fontmgr.cpp
index e915dcbaf7..b9cfd6fb28 100644
--- a/xfa/fxfa/app/xfa_fontmgr.cpp
+++ b/xfa/fxfa/app/xfa_fontmgr.cpp
@@ -1861,7 +1861,8 @@ IFX_Font* CXFA_PDFFontMgr::FindFont(CFX_ByteString strPsName,
   for (const auto& it : *pFontSetDict) {
     const CFX_ByteString& key = it.first;
     CPDF_Object* pObj = it.second;
-    if (!PsNameMatchDRFontName(strPsName, bBold, bItalic, key, bStrictMatch)) {
+    if (!PsNameMatchDRFontName(strPsName.AsByteStringC(), bBold, bItalic, key,
+                               bStrictMatch)) {
       continue;
     }
     CPDF_Object* pDirect = pObj->GetDirect();
-- 
cgit v1.2.3