diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-06-20 16:10:13 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-20 16:10:13 +0000 |
| commit | b6b01cb2cbaf6b38736f4dfebb9b6cdc243960f9 (patch) | |
| tree | 3219404f5dbafe19205ce85d19acaf3b1178f977 /fxjs/cjs_app.cpp | |
| parent | b3345feca2741cef2073d18da414237589528dd0 (diff) | |
| download | pdfium-b6b01cb2cbaf6b38736f4dfebb9b6cdc243960f9.tar.xz | |
Re-work some more c_str() usage.
Many of these are converting ByteString => c_str => ByteStringView, since
the ByteStringView ctor is implicit. This is unfortunate, since that
involves a strlen() which the ByteString already knows if we use
AsStringView() instead.
This changed one test result where we can now return the string
"\0" instead of "" -- since strlen no longer eats the NUL. This
seems consistent, say, with String.fromCharCode().
Change-Id: I17f68d1a1f4b352960208f9148e68ab4c4d78bd2
Reviewed-on: https://pdfium-review.googlesource.com/35590
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs/cjs_app.cpp')
| -rw-r--r-- | fxjs/cjs_app.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fxjs/cjs_app.cpp b/fxjs/cjs_app.cpp index 61eb632939..36a1212715 100644 --- a/fxjs/cjs_app.cpp +++ b/fxjs/cjs_app.cpp @@ -176,9 +176,9 @@ CJS_Return CJS_App::get_platform(CJS_Runtime* pRuntime) { if (!pFormFillEnv) return CJS_Return(JSMessage::kBadObjectError); - WideString platfrom = pFormFillEnv->GetPlatform(); - if (!platfrom.IsEmpty()) - return CJS_Return(pRuntime->NewString(platfrom.c_str())); + WideString platform = pFormFillEnv->GetPlatform(); + if (!platform.IsEmpty()) + return CJS_Return(pRuntime->NewString(platform.AsStringView())); #endif return CJS_Return(pRuntime->NewString(JS_STR_PLATFORM)); } @@ -196,7 +196,7 @@ CJS_Return CJS_App::get_language(CJS_Runtime* pRuntime) { WideString language = pFormFillEnv->GetLanguage(); if (!language.IsEmpty()) - return CJS_Return(pRuntime->NewString(language.c_str())); + return CJS_Return(pRuntime->NewString(language.AsStringView())); #endif return CJS_Return(pRuntime->NewString(JS_STR_LANGUAGE)); } @@ -572,7 +572,7 @@ CJS_Return CJS_App::response(CJS_Runtime* pRuntime, return CJS_Return(pRuntime->NewString( WideString::FromUTF16LE(reinterpret_cast<uint16_t*>(pBuff.data()), nLengthBytes / sizeof(uint16_t)) - .c_str())); + .AsStringView())); } CJS_Return CJS_App::get_media(CJS_Runtime* pRuntime) { |