diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-08-09 21:32:47 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-09 21:32:47 +0000 |
| commit | fd7cede17e027a83de2aff3bc0f5ee875271e444 (patch) | |
| tree | c1576d19a8e8c99ebbcf9dba4e75ef4665e631cc /core/fxcrt/widestring.cpp | |
| parent | 60627d6eafd025dde711e532eee6866840c04bef (diff) | |
| download | pdfium-fd7cede17e027a83de2aff3bc0f5ee875271e444.tar.xz | |
Move all utf8 decoding under fx_string.h
Put encoder in cfx_utf8encoder.{h,cpp} to parallel decoder.
Add tests, and fix one corner case involving 0xff.
Change-Id: Ib97540afdc708bcc6280a79c76734ec68ea72690
Reviewed-on: https://pdfium-review.googlesource.com/39770
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxcrt/widestring.cpp')
| -rw-r--r-- | core/fxcrt/widestring.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/core/fxcrt/widestring.cpp b/core/fxcrt/widestring.cpp index 97073f170d..e3c08d72e1 100644 --- a/core/fxcrt/widestring.cpp +++ b/core/fxcrt/widestring.cpp @@ -12,7 +12,6 @@ #include <cctype> #include <cwctype> -#include "core/fxcrt/cfx_utf8decoder.h" #include "core/fxcrt/fx_codepage.h" #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/fx_safe_types.h" @@ -885,14 +884,7 @@ WideString WideString::FromLocal(const ByteStringView& bstr) { // static WideString WideString::FromUTF8(const ByteStringView& str) { - if (str.IsEmpty()) - return WideString(); - - CFX_UTF8Decoder decoder; - for (size_t i = 0; i < str.GetLength(); i++) - decoder.Input(str[i]); - - return WideString(decoder.GetResult()); + return FX_UTF8Decode(str); } // static |