From 3a83266acee37e99832adaf1337c6b3ab7559f50 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 2 Mar 2015 12:59:05 -0800 Subject: 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/include/javascript/resource.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'fpdfsdk/include/javascript/resource.h') diff --git a/fpdfsdk/include/javascript/resource.h b/fpdfsdk/include/javascript/resource.h index 058b5fd893..8f0a25061e 100644 --- a/fpdfsdk/include/javascript/resource.h +++ b/fpdfsdk/include/javascript/resource.h @@ -26,8 +26,12 @@ class CJS_Context; #define IDS_STRING_RUN 25630 #define IDS_STRING_JSPRINT1 25632 #define IDS_STRING_JSPRINT2 25633 -#define IDS_JSPARAM_INCORRECT 25635 +#define IDS_STRING_JSNOGLOBAL 25635 +#define IDS_STRING_JSREADONLY 25636 CFX_WideString JSGetStringFromID(CJS_Context* pContext, FX_UINT id); +CFX_WideString JSFormatErrorString(const char* class_name, + const char* property_name, + const CFX_WideString& details); #endif // FPDFSDK_INCLUDE_JAVASCRIPT_RESOURCE_H_ -- cgit v1.2.3