Pass WideStrings without narrowing to c_str in javascript/

fpdfsdk/jsapi/fxjs_v8.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/jsapi/include/fxjs_v8.h"
 
 #include <vector>
 
@@ skipping 565 matching lines @@
 }
 
 void FXJS_FreePrivate(v8::Local<v8::Object> pObj) {
   if (pObj.IsEmpty() || !pObj->InternalFieldCount())
     return;
   FXJS_FreePrivate(pObj->GetAlignedPointerFromInternalField(0));
   pObj->SetAlignedPointerInInternalField(0, NULL);
 }
 
 v8::Local<v8::String> FXJS_WSToJSString(v8::Isolate* pIsolate,
-                                        const wchar_t* PropertyName,
-                                        int Len) {
-  CFX_WideString ws = CFX_WideString(PropertyName, Len);
-  CFX_ByteString bs = ws.UTF8Encode();
+                                        const CFX_WideString& wsPropertyName) {
+  CFX_ByteString bs = wsPropertyName.UTF8Encode();
   if (!pIsolate)
     pIsolate = v8::Isolate::GetCurrent();
   return v8::String::NewFromUtf8(pIsolate, bs.c_str(),
-                                 v8::NewStringType::kNormal)
+                                 v8::NewStringType::kNormal, bs.GetLength())
       .ToLocalChecked();
 }
 
-v8::Local<v8::Value> FXJS_GetObjectElement(v8::Isolate* pIsolate,
-                                           v8::Local<v8::Object> pObj,
-                                           const wchar_t* PropertyName) {
+v8::Local<v8::Value> FXJS_GetObjectElement(
+    v8::Isolate* pIsolate,
+    v8::Local<v8::Object> pObj,
+    const CFX_WideString& wsPropertyName) {
   if (pObj.IsEmpty())
     return v8::Local<v8::Value>();
   v8::Local<v8::Value> val;
   if (!pObj->Get(pIsolate->GetCurrentContext(),
-                 FXJS_WSToJSString(pIsolate, PropertyName))
+                 FXJS_WSToJSString(pIsolate, wsPropertyName))
            .ToLocal(&val))
     return v8::Local<v8::Value>();
   return val;
 }
 
 v8::Local<v8::Array> FXJS_GetObjectElementNames(v8::Isolate* pIsolate,
                                                 v8::Local<v8::Object> pObj) {
   if (pObj.IsEmpty())
     return v8::Local<v8::Array>();
   v8::Local<v8::Array> val;
   if (!pObj->GetPropertyNames(pIsolate->GetCurrentContext()).ToLocal(&val))
     return v8::Local<v8::Array>();
   return val;
 }
 
 void FXJS_PutObjectString(v8::Isolate* pIsolate,
                           v8::Local<v8::Object> pObj,
-                          const wchar_t* PropertyName,
-                          const wchar_t* sValue) {
+                          const CFX_WideString& wsPropertyName,
+                          const CFX_WideString& wsValue) {
   if (pObj.IsEmpty())
     return;
   pObj->Set(pIsolate->GetCurrentContext(),
-            FXJS_WSToJSString(pIsolate, PropertyName),
-            FXJS_WSToJSString(pIsolate, sValue))
+            FXJS_WSToJSString(pIsolate, wsPropertyName),
+            FXJS_WSToJSString(pIsolate, wsValue))
       .FromJust();
 }
 
 void FXJS_PutObjectNumber(v8::Isolate* pIsolate,
                           v8::Local<v8::Object> pObj,
-                          const wchar_t* PropertyName,
+                          const CFX_WideString& wsPropertyName,
                           int nValue) {
   if (pObj.IsEmpty())
     return;
   pObj->Set(pIsolate->GetCurrentContext(),
-            FXJS_WSToJSString(pIsolate, PropertyName),
+            FXJS_WSToJSString(pIsolate, wsPropertyName),
             v8::Int32::New(pIsolate, nValue))
       .FromJust();
 }
 
 void FXJS_PutObjectNumber(v8::Isolate* pIsolate,
                           v8::Local<v8::Object> pObj,
-                          const wchar_t* PropertyName,
+                          const CFX_WideString& wsPropertyName,
                           float fValue) {
   if (pObj.IsEmpty())
     return;
   pObj->Set(pIsolate->GetCurrentContext(),
-            FXJS_WSToJSString(pIsolate, PropertyName),
+            FXJS_WSToJSString(pIsolate, wsPropertyName),
             v8::Number::New(pIsolate, (double)fValue))
       .FromJust();
 }
 
 void FXJS_PutObjectNumber(v8::Isolate* pIsolate,
                           v8::Local<v8::Object> pObj,
-                          const wchar_t* PropertyName,
+                          const CFX_WideString& wsPropertyName,
                           double dValue) {
   if (pObj.IsEmpty())
     return;
   pObj->Set(pIsolate->GetCurrentContext(),
-            FXJS_WSToJSString(pIsolate, PropertyName),
+            FXJS_WSToJSString(pIsolate, wsPropertyName),
             v8::Number::New(pIsolate, (double)dValue))
       .FromJust();
 }
 
 void FXJS_PutObjectBoolean(v8::Isolate* pIsolate,
                            v8::Local<v8::Object> pObj,
-                           const wchar_t* PropertyName,
+                           const CFX_WideString& wsPropertyName,
                            bool bValue) {
   if (pObj.IsEmpty())
     return;
   pObj->Set(pIsolate->GetCurrentContext(),
-            FXJS_WSToJSString(pIsolate, PropertyName),
+            FXJS_WSToJSString(pIsolate, wsPropertyName),
             v8::Boolean::New(pIsolate, bValue))
       .FromJust();
 }
 
 void FXJS_PutObjectObject(v8::Isolate* pIsolate,
                           v8::Local<v8::Object> pObj,
-                          const wchar_t* PropertyName,
+                          const CFX_WideString& wsPropertyName,
                           v8::Local<v8::Object> pPut) {
   if (pObj.IsEmpty())
     return;
   pObj->Set(pIsolate->GetCurrentContext(),
-            FXJS_WSToJSString(pIsolate, PropertyName), pPut)
+            FXJS_WSToJSString(pIsolate, wsPropertyName), pPut)
       .FromJust();
 }
 
 void FXJS_PutObjectNull(v8::Isolate* pIsolate,
                         v8::Local<v8::Object> pObj,
-                        const wchar_t* PropertyName) {
+                        const CFX_WideString& wsPropertyName) {
   if (pObj.IsEmpty())
     return;
   pObj->Set(pIsolate->GetCurrentContext(),
-            FXJS_WSToJSString(pIsolate, PropertyName), v8::Local<v8::Object>())
+            FXJS_WSToJSString(pIsolate, wsPropertyName),
+            v8::Local<v8::Object>())
       .FromJust();
 }
 
 v8::Local<v8::Array> FXJS_NewArray(v8::Isolate* pIsolate) {
   return v8::Array::New(pIsolate);
 }
 
 unsigned FXJS_PutArrayElement(v8::Isolate* pIsolate,
                               v8::Local<v8::Array> pArray,
                               unsigned index,
@@ skipping 106 matching lines @@
                                   v8::Local<v8::Value> pValue) {
   if (pValue.IsEmpty())
     return v8::Local<v8::Array>();
   v8::Local<v8::Context> context = pIsolate->GetCurrentContext();
   return v8::Local<v8::Array>::Cast(pValue->ToObject(context).ToLocalChecked());
 }
 
 void FXJS_ValueCopy(v8::Local<v8::Value>& pTo, v8::Local<v8::Value> pFrom) {
   pTo = pFrom;
 }