commit 3a83266acee37e99832adaf1337c6b3ab7559f50
author Tom Sepez <tsepez@chromium.org> Mon Mar 02 12:59:05 2015 -0800
committer Tom Sepez <tsepez@chromium.org> Mon Mar 02 12:59:05 2015 -0800
tree 8700b04028864100e2618a72e4a9f52a6bc2f224
parent fb3eea5323bf59884659510a6743037cc1d546cd

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

Cherry-pick from b720d0a14601f1496ef15297bc46d401f5a2a890 +
Manually resolve merge conflicts +
Fix more IWYU to fix compile.

Original Review URL: https://codereview.chromium.org/963193003
TBR=thestig@chromium.org

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

fpdfsdk/src/javascript/global.cpp

diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp
index 39e6dc0..208fa20 100644
--- a/fpdfsdk/src/javascript/global.cpp
+++ b/fpdfsdk/src/javascript/global.cpp
@@ -4,16 +4,17 @@
  
 // 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 ---------------------------- */
 
@@ -271,9 +272,10 @@
 
 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;
 	}
 
@@ -289,7 +291,7 @@
 		}
 	}
 
-	//sError = JSGetStringFromID(IDS_JSPARAM_INCORRECT);	
+	sError = JSGetStringFromID(pContext, IDS_STRING_JSNOGLOBAL);
 	return FALSE;
 }