diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-06 10:51:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-06 10:51:14 -0700 |
| commit | 6fe7d2174a47107578da912299c93b4dfb9f2add (patch) | |
| tree | 4f2d343c477c9a4ec18d25801800eb08d8938dad /core/fxcrt/fx_basic_wstring.cpp | |
| parent | 89bdd0876e6b92c959839908204eb82337a27ba2 (diff) | |
| download | pdfium-6fe7d2174a47107578da912299c93b4dfb9f2add.tar.xz | |
Make CFX_WideString::FromUTF8() take a CFX_ByteStringC argument.
Methods that take string arguments and do not persist them should
take *StringC types as argument rather than discrete ptr/len args.
Avoids a number of implicit casts from CFX_ByteString to char*.
BUG=
Review URL: https://codereview.chromium.org/1861183002
Diffstat (limited to 'core/fxcrt/fx_basic_wstring.cpp')
| -rw-r--r-- | core/fxcrt/fx_basic_wstring.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/fxcrt/fx_basic_wstring.cpp b/core/fxcrt/fx_basic_wstring.cpp index cd60036acd..627573fa7d 100644 --- a/core/fxcrt/fx_basic_wstring.cpp +++ b/core/fxcrt/fx_basic_wstring.cpp @@ -372,13 +372,12 @@ CFX_WideString CFX_WideString::FromCodePage(const CFX_ByteString& str, } // static -CFX_WideString CFX_WideString::FromUTF8(const char* str, FX_STRSIZE len) { - if (!str || 0 == len) { +CFX_WideString CFX_WideString::FromUTF8(const CFX_ByteStringC& str) { + if (str.IsEmpty()) return CFX_WideString(); - } CFX_UTF8Decoder decoder; - for (FX_STRSIZE i = 0; i < len; i++) { + for (FX_STRSIZE i = 0; i < str.GetLength(); i++) { decoder.Input(str[i]); } return decoder.GetResult(); |