commit 018935c9304bebf13fbad20b124d775ccae87fae
author tsepez <tsepez@chromium.org> Fri Apr 15 13:15:12 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Apr 15 13:15:12 2016 -0700
tree a8db5b909a5cef43317d924919e7c1be77c505c3
parent c3b26b1479824aa5ce745c220a82de7528bc26a9

Pass WideStrings without narrowing to c_str in javascript/

Avoid string duplication when the caller already has one.

Review URL: https://codereview.chromium.org/1883273003

fpdfsdk/javascript/Document.cpp

diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp
index 4c361b1..551d649 100644
--- a/fpdfsdk/javascript/Document.cpp
+++ b/fpdfsdk/javascript/Document.cpp
@@ -769,16 +769,15 @@
     CJS_Runtime* pRuntime = pContext->GetJSRuntime();
     v8::Local<v8::Object> pObj =
         FXJS_NewFxDynamicObj(pRuntime->GetIsolate(), pRuntime, -1);
-    FXJS_PutObjectString(isolate, pObj, L"Author", cwAuthor.c_str());
-    FXJS_PutObjectString(isolate, pObj, L"Title", cwTitle.c_str());
-    FXJS_PutObjectString(isolate, pObj, L"Subject", cwSubject.c_str());
-    FXJS_PutObjectString(isolate, pObj, L"Keywords", cwKeywords.c_str());
-    FXJS_PutObjectString(isolate, pObj, L"Creator", cwCreator.c_str());
-    FXJS_PutObjectString(isolate, pObj, L"Producer", cwProducer.c_str());
-    FXJS_PutObjectString(isolate, pObj, L"CreationDate",
-                         cwCreationDate.c_str());
-    FXJS_PutObjectString(isolate, pObj, L"ModDate", cwModDate.c_str());
-    FXJS_PutObjectString(isolate, pObj, L"Trapped", cwTrapped.c_str());
+    FXJS_PutObjectString(isolate, pObj, L"Author", cwAuthor);
+    FXJS_PutObjectString(isolate, pObj, L"Title", cwTitle);
+    FXJS_PutObjectString(isolate, pObj, L"Subject", cwSubject);
+    FXJS_PutObjectString(isolate, pObj, L"Keywords", cwKeywords);
+    FXJS_PutObjectString(isolate, pObj, L"Creator", cwCreator);
+    FXJS_PutObjectString(isolate, pObj, L"Producer", cwProducer);
+    FXJS_PutObjectString(isolate, pObj, L"CreationDate", cwCreationDate);
+    FXJS_PutObjectString(isolate, pObj, L"ModDate", cwModDate);
+    FXJS_PutObjectString(isolate, pObj, L"Trapped", cwTrapped);
 
     // It's to be compatible to non-standard info dictionary.
     for (const auto& it : *pDictionary) {
@@ -786,14 +785,12 @@
       CPDF_Object* pValueObj = it.second;
       CFX_WideString wsKey = CFX_WideString::FromUTF8(bsKey.AsStringC());
       if (pValueObj->IsString() || pValueObj->IsName()) {
-        FXJS_PutObjectString(isolate, pObj, wsKey.c_str(),
-                             pValueObj->GetUnicodeText().c_str());
+        FXJS_PutObjectString(isolate, pObj, wsKey, pValueObj->GetUnicodeText());
       } else if (pValueObj->IsNumber()) {
-        FXJS_PutObjectNumber(isolate, pObj, wsKey.c_str(),
+        FXJS_PutObjectNumber(isolate, pObj, wsKey,
                              (float)pValueObj->GetNumber());
       } else if (pValueObj->IsBoolean()) {
-        FXJS_PutObjectBoolean(isolate, pObj, wsKey.c_str(),
-                              !!pValueObj->GetInteger());
+        FXJS_PutObjectBoolean(isolate, pObj, wsKey, !!pValueObj->GetInteger());
       }
     }
     vp << pObj;