Remove CFX_{Byte,Wide}String::ConvertFrom().

core/src/fxcrt/fx_basic_wstring.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 <stddef.h>  // For offsetof().
 
 #include <algorithm>
 #include <cctype>
@@ skipping 285 matching lines @@
   FX_CHAR* buffer = result.GetBuffer(len * 2 + 2);
   for (int i = 0; i < len; i++) {
     buffer[i * 2] = m_pData->m_String[i] & 0xff;
     buffer[i * 2 + 1] = m_pData->m_String[i] >> 8;
   }
   buffer[len * 2] = 0;
   buffer[len * 2 + 1] = 0;
   result.ReleaseBuffer(len * 2 + 2);
   return result;
 }
-void CFX_WideString::ConvertFrom(const CFX_ByteString& str,
-                                 CFX_CharMap* pCharMap) {
-  if (!pCharMap) {
-    pCharMap = CFX_CharMap::GetDefaultMapper();
-  }
-  *this = pCharMap->m_GetWideString(pCharMap, str);
-}
+
 void CFX_WideString::Reserve(FX_STRSIZE len) {
   GetBuffer(len);
   ReleaseBuffer(GetLength());
 }
 FX_WCHAR* CFX_WideString::GetBuffer(FX_STRSIZE nMinBufLength) {
   if (!m_pData && nMinBufLength == 0) {
     return NULL;
   }
   if (m_pData && m_pData->m_nRefs <= 1 &&
       m_pData->m_nAllocLength >= nMinBufLength) {
@@ skipping 16 matching lines @@
   m_pData = StringData::Create(nMinBufLength);
   if (!m_pData) {
     return NULL;
   }
   FXSYS_memcpy(m_pData->m_String, pOldData->m_String,
                (nOldLen + 1) * sizeof(FX_WCHAR));
   m_pData->m_nDataLength = nOldLen;
   pOldData->Release();
   return m_pData->m_String;
 }
-CFX_WideString CFX_WideString::FromLocal(const char* str, FX_STRSIZE len) {
-  CFX_WideString result;
-  result.ConvertFrom(CFX_ByteString(str, len));
-  return result;
+
+// static
+CFX_WideString CFX_WideString::FromLocal(const CFX_ByteString& str) {
+  return FromCodePage(str, 0);
 }
+
+// static
+CFX_WideString CFX_WideString::FromCodePage(const CFX_ByteString& str,
+                                            FX_WORD codepage) {
+  CFX_CharMap* pCharMap = CFX_CharMap::GetDefaultMapper(codepage);
+  return pCharMap->m_GetWideString(pCharMap, str);
+}
+
+// static
 CFX_WideString CFX_WideString::FromUTF8(const char* str, FX_STRSIZE len) {
   if (!str || 0 == len) {
     return CFX_WideString();
   }
 
   CFX_UTF8Decoder decoder;
   for (FX_STRSIZE i = 0; i < len; i++) {
     decoder.Input(str[i]);
   }
   return decoder.GetResult();
 }
+
+// static
 CFX_WideString CFX_WideString::FromUTF16LE(const unsigned short* wstr,
                                            FX_STRSIZE wlen) {
   if (!wstr || 0 == wlen) {
     return CFX_WideString();
   }
 
   CFX_WideString result;
   FX_WCHAR* buf = result.GetBuffer(wlen);
   for (int i = 0; i < wlen; i++) {
     buf[i] = wstr[i];
   }
   result.ReleaseBuffer(wlen);
   return result;
 }
+
 FX_STRSIZE CFX_WideString::WStringLength(const unsigned short* str) {
   FX_STRSIZE len = 0;
   if (str)
     while (str[len])
       len++;
   return len;
 }
 
 void CFX_WideString::AllocCopy(CFX_WideString& dest,
                                FX_STRSIZE nCopyLen,
@@ skipping 663 matching lines @@
       return (CFX_CharMap*)&g_DefaultJISMapper;
     case 936:
       return (CFX_CharMap*)&g_DefaultGBKMapper;
     case 949:
       return (CFX_CharMap*)&g_DefaultUHCMapper;
     case 950:
       return (CFX_CharMap*)&g_DefaultBig5Mapper;
   }
   return NULL;
 }