Merge to XFA: Kill off JS_ErrorString type.

fpdfsdk/src/javascript/global.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 "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Context.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_EventHandler.h"
@@ skipping 126 matching lines @@
         ASSERT(pFactory);
         m_pGlobalData = pFactory->NewGlobalData(pApp);
         UpdateGlobalPersistentVariables();
 }
 
 FX_BOOL global_alternate::QueryProperty(FX_LPCWSTR propname)
 {
         return CFX_WideString(propname) != L"setPersistent";
 }
 
-FX_BOOL global_alternate::DelProperty(IFXJS_Context* cc, FX_LPCWSTR propname, JS_ErrorString& sError)
+FX_BOOL global_alternate::DelProperty(IFXJS_Context* cc, FX_LPCWSTR propname, CFX_WideString& sError)
 {
         js_global_data* pData = NULL;
         CFX_ByteString sPropName = CFX_ByteString::FromUnicode(propname);
 
         if (m_mapGlobal.Lookup(sPropName, (FX_LPVOID&)pData))
         {
                 pData->bDeleted = TRUE;
                 return TRUE;
         }
 
         return FALSE;
 }
 
-FX_BOOL global_alternate::DoProperty(IFXJS_Context* cc, FX_LPCWSTR propname, CJS_PropValue& vp, JS_ErrorString& sError)
+FX_BOOL global_alternate::DoProperty(IFXJS_Context* cc, FX_LPCWSTR propname, CJS_PropValue& vp, CFX_WideString& sError)
 {
         if (vp.IsSetting())
         {
                 CFX_ByteString sPropName = CFX_ByteString::FromUnicode(propname);
                 switch (vp.GetType())
                 {
                 case VT_number:
                         {
                                 double dData;
                                 vp >> dData;
@@ skipping 91 matching lines @@
                 else
                 {
                         vp.SetNull();
                         return TRUE;
                 }
         }
 
         return FALSE;
 }
 
-FX_BOOL global_alternate::setPersistent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError)
+FX_BOOL global_alternate::setPersistent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         CJS_Context* pContext = static_cast<CJS_Context*>(cc);
         if (params.size() != 2)
         {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
                 return FALSE;
         }
 
         CFX_ByteString sName = params[0];
 
@@ skipping 352 matching lines @@
   if (nHash == JSCONST_nDateHash)
     return VT_date;
   if (nHash == JSCONST_nObjectHash)
     return VT_object;
   if (nHash == JSCONST_nFXobjHash)
     return VT_fxobject;
 
   return VT_unknown;
 }