Merge to XFA: Return error information from pdfium to JS.

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/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
+#include "../../include/javascript/JS_Context.h"
 #include "../../include/javascript/JS_Define.h"
+#include "../../include/javascript/JS_EventHandler.h"
+#include "../../include/javascript/JS_GlobalData.h"
 #include "../../include/javascript/JS_Object.h"
 #include "../../include/javascript/JS_Value.h"
-#include "../../include/javascript/JS_GlobalData.h"
+#include "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/global.h"
-#include "../../include/javascript/JS_EventHandler.h"
-#include "../../include/javascript/JS_Context.h"
 #include "../../include/fpdfxfa/fpdfxfa_app.h"
+#include "../../include/javascript/resource.h"
 
 /* ---------------------------- global ---------------------------- */
 
 // Helper class for compile-time calculation of hash values in order to
 // avoid having global object initializers.
 template <unsigned ACC, wchar_t... Ns>
 struct CHash;
 
 // Only needed to hash single-character strings.
 template <wchar_t N>
@@ skipping 237 matching lines @@
                         vp.SetNull();
                         return TRUE;
                 }
         }
 
         return FALSE;
 }
 
 FX_BOOL global_alternate::setPersistent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError)
 {
+        CJS_Context* pContext = static_cast<CJS_Context*>(cc);
         if (params.size() != 2)
         {
-                //sError = JSGetStringFromID(IDS_STRING_JSPARAMERROR);  
+                sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
                 return FALSE;
         }
 
         CFX_ByteString sName = params[0];
 
         js_global_data* pData = NULL;
         if (m_mapGlobal.Lookup(sName, (FX_LPVOID&)pData))
         {
                 if (pData && !pData->bDeleted)
                 {
                         pData->bPersistent = (bool)params[1];
                         return TRUE;
                 }
         }
 
-        //sError = JSGetStringFromID(IDS_JSPARAM_INCORRECT);    
+        sError = JSGetStringFromID(pContext, IDS_STRING_JSNOGLOBAL);
         return FALSE;
 }
 
 void global_alternate::UpdateGlobalPersistentVariables()
 {
         ASSERT(m_pGlobalData != NULL);
 
         for (int i=0,sz=m_pGlobalData->GetSize(); i<sz; i++)
         {
                 CJS_GlobalData_Element* pData = m_pGlobalData->GetAt(i);
@@ skipping 331 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;
 }