Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: fpdfsdk/include/javascript/JS_Define.h

Issue 963193003: Return error information from pdfium to JS. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Fix scope of c_str() Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « fpdfsdk/include/javascript/IJavaScript.h ('k') | fpdfsdk/include/javascript/JS_Object.h » ('j') | fpdfsdk/src/javascript/Document.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: fpdfsdk/include/javascript/JS_Define.h
diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h
index 4246e0196406676df1b1f9b341369cbbd765578c..d51ef3c6f31962025c9c57c4954562c487fcdac7 100644
--- a/fpdfsdk/include/javascript/JS_Define.h
+++ b/fpdfsdk/include/javascript/JS_Define.h
@@ -7,6 +7,8 @@
#ifndef _JS_DEFINE_H_
#define _JS_DEFINE_H_
+#include "../jsapi/fxjs_v8.h"
+
typedef v8::Value JSValue;
typedef v8::Handle<v8::Object> JSObject;
typedef v8::Handle<v8::Object> JSFXObject;
@@ -37,14 +39,31 @@ struct JSMethodSpec
unsigned nParamNum;
};
-typedef CFX_WideString JS_ErrorString;
-
#define JS_TRUE (unsigned)1
#define JS_FALSE (unsigned)0
typedef CFX_ArrayTemplate<float> CJS_PointsArray;
typedef CFX_ArrayTemplate<int> CJS_IntArray;
+typedef CFX_WideString JS_ErrorString;
+
+namespace {
Lei Zhang 2015/02/28 02:50:49 I don't think this stops anyone that includes JS_D
Tom Sepez 2015/03/02 19:03:44 Argh, yeah, I'm in a header. I'll put this into t
+
+CFX_WideString FormatErrorString(const char* class_name,
+ const char* property_name,
+ const CFX_WideString& details) {
+ CFX_WideString result = CFX_WideString::FromLocal(class_name);
+ if (property_name) {
+ result += L".";
+ result += CFX_WideString::FromLocal(property_name);
+ }
+ result += L": ";
+ result += details;
+ return result;
+}
+
+} // namespace
+
/* ====================================== PUBLIC DEFINE SPEC ============================================== */
#define JS_WIDESTRING(widestring) L###widestring
@@ -63,7 +82,7 @@ typedef CFX_ArrayTemplate<int> CJS_IntArray;
/* ======================================== PROP CALLBACK ============================================ */
-template <class C, FX_BOOL (C::*M)(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError)>
+template <class C, FX_BOOL (C::*M)(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)>
void JSPropGetter(const char* prop_name_string,
const char* class_name_string,
v8::Local<v8::String> property,
@@ -76,19 +95,17 @@ void JSPropGetter(const char* prop_name_string,
IFXJS_Context* pContext = pRuntime->GetCurrentContext();
CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());
C* pObj = reinterpret_cast<C*>(pJSObj->GetEmbedObject());
- JS_ErrorString sError;
+ CFX_WideString sError;
CJS_PropValue value(isolate);
value.StartGetting();
if (!(pObj->*M)(pContext, value, sError)) {
- CFX_ByteString cbName;
- cbName.Format("%s.%s", class_name_string, prop_name_string);
- JS_Error(NULL, CFX_WideString::FromLocal(cbName), sError);
+ JS_Error(isolate, FormatErrorString(class_name_string, prop_name_string, sError));
return;
}
info.GetReturnValue().Set((v8::Handle<v8::Value>)value);
}
-template <class C, FX_BOOL (C::*M)(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError)>
+template <class C, FX_BOOL (C::*M)(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)>
void JSPropSetter(const char* prop_name_string,
const char* class_name_string,
v8::Local<v8::String> property,
@@ -102,13 +119,11 @@ void JSPropSetter(const char* prop_name_string,
IFXJS_Context* pContext = pRuntime->GetCurrentContext();
CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());
C* pObj = reinterpret_cast<C*>(pJSObj->GetEmbedObject());
- JS_ErrorString sError;
+ CFX_WideString sError;
CJS_PropValue propValue(CJS_Value(isolate, value, VT_unknown));
propValue.StartSetting();
if (!(pObj->*M)(pContext, propValue, sError)) {
- CFX_ByteString cbName;
- cbName.Format("%s.%s", class_name_string, prop_name_string);
- JS_Error(NULL, CFX_WideString::FromLocal(cbName), sError);
+ JS_Error(isolate, FormatErrorString(class_name_string, prop_name_string, sError));
}
}
@@ -129,7 +144,7 @@ void JSPropSetter(const char* prop_name_string,
/* ========================================= METHOD CALLBACK =========================================== */
-template <class C, FX_BOOL (C::*M)(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError)>
+template <class C, FX_BOOL (C::*M)(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)>
void JSMethod(const char* method_name_string,
const char* class_name_string,
const v8::FunctionCallbackInfo<v8::Value>& info) {
@@ -146,11 +161,9 @@ void JSMethod(const char* method_name_string,
CJS_Value valueRes(isolate);
CJS_Object* pJSObj = (CJS_Object *)JS_GetPrivate(isolate,info.Holder());
C* pObj = reinterpret_cast<C*>(pJSObj->GetEmbedObject());
- JS_ErrorString sError;
+ CFX_WideString sError;
if (!(pObj->*M)(cc, parameters, valueRes, sError)) {
- CFX_ByteString cbName;
- cbName.Format("%s.%s", class_name_string, method_name_string);
- JS_Error(NULL, CFX_WideString::FromLocal(cbName), sError);
+ JS_Error(isolate, FormatErrorString(class_name_string, method_name_string, sError));
return;
}
info.GetReturnValue().Set(valueRes.ToJSValue());
@@ -160,14 +173,14 @@ void JSMethod(const char* method_name_string,
static void method_name##_static( \
const v8::FunctionCallbackInfo<v8::Value>& info) { \
JSMethod<class_name, &class_name::method_name>( \
- #class_name, #method_name, info); \
+ #method_name, #class_name, info); \
}
#define JS_SPECIAL_STATIC_METHOD(method_name, class_alternate, class_name) \
static void method_name##_static( \
const v8::FunctionCallbackInfo<v8::Value>& info) { \
JSMethod<class_alternate, &class_alternate::method_name>( \
- #class_name, #method_name, info); \
+ #method_name, #class_name, info); \
}
/* ===================================== JS CLASS =============================================== */
@@ -278,14 +291,12 @@ void JSSpecialPropGet(const char* class_name,
Alt* pObj = reinterpret_cast<Alt*>(pJSObj->GetEmbedObject());
v8::String::Utf8Value utf8_value(property);
CFX_WideString propname = CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());
- JS_ErrorString sError;
+ CFX_WideString sError;
CJS_PropValue value(isolate);
value.StartGetting();
if (!pObj->DoProperty(pRuntimeContext, propname.c_str(), value, sError)) {
- CFX_ByteString cbName;
- cbName.Format("%s.%s", class_name, L"GetProperty");
- JS_Error(NULL,CFX_WideString::FromLocal(cbName), sError);
- return;
+ JS_Error(isolate, FormatErrorString(class_name, "GetProperty", sError));
+ return;
}
info.GetReturnValue().Set((v8::Handle<v8::Value>)value);
}
@@ -305,13 +316,11 @@ void JSSpecialPropPut(const char* class_name,
Alt* pObj = reinterpret_cast<Alt*>(pJSObj->GetEmbedObject());
v8::String::Utf8Value utf8_value(property);
CFX_WideString propname = CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());
- JS_ErrorString sError;
+ CFX_WideString sError;
CJS_PropValue PropValue(CJS_Value(isolate,value,VT_unknown));
PropValue.StartSetting();
if (!pObj->DoProperty(pRuntimeContext, propname.c_str(), PropValue, sError)) {
- CFX_ByteString cbName;
- cbName.Format("%s.%s", class_name, "PutProperty");
- JS_Error(NULL,CFX_WideString::FromLocal(cbName), sError);
+ JS_Error(isolate, FormatErrorString(class_name, "PutProperty", sError));
}
}
@@ -329,7 +338,7 @@ void JSSpecialPropDel(const char* class_name,
Alt* pObj = reinterpret_cast<Alt*>(pJSObj->GetEmbedObject());
v8::String::Utf8Value utf8_value(property);
CFX_WideString propname = CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());
- JS_ErrorString sError;
+ CFX_WideString sError;
if (!pObj->DelProperty(pRuntimeContext, propname.c_str(), sError)) {
CFX_ByteString cbName;
cbName.Format("%s.%s", class_name, "DelProperty");
@@ -408,9 +417,9 @@ int js_class_name::Init(IJS_Runtime* pRuntime, FXJSOBJTYPE eObjType)\
/* ======================================== GLOBAL METHODS ============================================ */
-template <FX_BOOL (*F)(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError)>
+template <FX_BOOL (*F)(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)>
void JSGlobalFunc(const char *func_name_string,
- const v8::FunctionCallbackInfo<v8::Value>& info) {
+ const v8::FunctionCallbackInfo<v8::Value>& info) {
v8::Isolate* isolate = info.GetIsolate();
v8::Local<v8::Context> context = isolate->GetCurrentContext();
v8::Local<v8::Value> v = context->GetEmbedderData(1);
@@ -422,10 +431,10 @@ void JSGlobalFunc(const char *func_name_string,
parameters.push_back(CJS_Value(isolate, info[i], VT_unknown));
}
CJS_Value valueRes(isolate);
- JS_ErrorString sError;
+ CFX_WideString sError;
if (!(*F)(cc, parameters, valueRes, sError))
{
- JS_Error(NULL, JS_WIDESTRING(fun_name), sError);
+ JS_Error(isolate, FormatErrorString(func_name_string, nullptr, sError));
return;
}
info.GetReturnValue().Set(valueRes.ToJSValue());
« no previous file with comments | « fpdfsdk/include/javascript/IJavaScript.h ('k') | fpdfsdk/include/javascript/JS_Object.h » ('j') | fpdfsdk/src/javascript/Document.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698