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/jsapi/fxjs_v8.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fpdfsdk/include/jsapi/fxjs_v8.h') diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h index b6ea60be13..c7fdf87747 100644 --- a/fpdfsdk/include/jsapi/fxjs_v8.h +++ b/fpdfsdk/include/jsapi/fxjs_v8.h @@ -8,6 +8,7 @@ #define FXJSAPI_H #include +#include "../../core/include/fxcrt/fx_string.h" // For CFX_WideString enum FXJSOBJTYPE { @@ -66,11 +67,10 @@ v8::Handle JS_GetThisObj(IJS_Runtime * pJSRuntime); int JS_GetObjDefnID(v8::Handle pObj); IJS_Runtime* JS_GetRuntime(v8::Handle pObj); int JS_GetObjDefnID(IJS_Runtime * pJSRuntime, const wchar_t* pObjName); -void JS_Error(v8::Value * pError,const wchar_t * main,const wchar_t * sub); +void JS_Error(v8::Isolate* isolate, const CFX_WideString& message); unsigned JS_CalcHash(const wchar_t* main, unsigned nLen); unsigned JS_CalcHash(const wchar_t* main); const wchar_t* JS_GetTypeof(v8::Handle pObj); -const wchar_t* JS_GetClassname(v8::Handle pObj); void JS_SetPrivate(IJS_Runtime* pJSRuntime, v8::Handle pObj, void* p); void* JS_GetPrivate(IJS_Runtime* pJSRuntime, v8::Handle pObj); void JS_SetPrivate(v8::Handle pObj, void* p); -- cgit v1.2.3