From 8b36e5cc3d5f5f579c6b060e2c40b896a4b02bc0 Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 8 Apr 2016 09:00:35 -0700 Subject: Make CFX_WideString::FromLocal() take a CFX_ByteStringC arg It doesn't persist the string beyond the duration of the call, hence it should take the *StringC variant. Doing so avoids some allocs by changing to the *StringC ctor in a few places, at the cost of some explicit .ToByteStringC() calls (which are cheap). Review URL: https://codereview.chromium.org/1862953004 --- core/fxcrt/include/fx_basic.h | 4 ++-- core/fxcrt/include/fx_string.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'core/fxcrt/include') diff --git a/core/fxcrt/include/fx_basic.h b/core/fxcrt/include/fx_basic.h index 744b2dd10f..1cb5174351 100644 --- a/core/fxcrt/include/fx_basic.h +++ b/core/fxcrt/include/fx_basic.h @@ -186,10 +186,10 @@ class CFX_FileBufferArchive { class CFX_CharMap { public: static CFX_ByteString GetByteString(uint16_t codepage, - const CFX_WideString& wstr); + const CFX_WideStringC& wstr); static CFX_WideString GetWideString(uint16_t codepage, - const CFX_ByteString& bstr); + const CFX_ByteStringC& bstr); CFX_CharMap() = delete; }; diff --git a/core/fxcrt/include/fx_string.h b/core/fxcrt/include/fx_string.h index 382e141dc2..8a0b3ff3db 100644 --- a/core/fxcrt/include/fx_string.h +++ b/core/fxcrt/include/fx_string.h @@ -497,8 +497,8 @@ class CFX_WideString { ~CFX_WideString(); - static CFX_WideString FromLocal(const CFX_ByteString& str); - static CFX_WideString FromCodePage(const CFX_ByteString& str, + static CFX_WideString FromLocal(const CFX_ByteStringC& str); + static CFX_WideString FromCodePage(const CFX_ByteStringC& str, uint16_t codepage); static CFX_WideString FromUTF8(const CFX_ByteStringC& str); -- cgit v1.2.3