Index: fpdfsdk/src/javascript/app.cpp |
diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp |
index c1dd41faffc67bf858110597992b38dbb4547050..ccdd8ab3dfb63fc811c03baba82bd04d7b72aeca 100644 |
--- a/fpdfsdk/src/javascript/app.cpp |
+++ b/fpdfsdk/src/javascript/app.cpp |
@@ -133,7 +133,7 @@ app::~app(void) |
m_aTimer.RemoveAll(); |
} |
-FX_BOOL app::activeDocs(OBJ_PROP_PARAMS) |
+FX_BOOL app::activeDocs(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError) |
{ |
if (vp.IsGetting()) |
{ |
@@ -191,7 +191,7 @@ FX_BOOL app::activeDocs(OBJ_PROP_PARAMS) |
return FALSE; |
} |
-FX_BOOL app::calculate(OBJ_PROP_PARAMS) |
+FX_BOOL app::calculate(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError) |
{ |
if (vp.IsSetting()) |
{ |
@@ -229,7 +229,7 @@ FX_BOOL app::calculate(OBJ_PROP_PARAMS) |
return TRUE; |
} |
-FX_BOOL app::formsVersion(OBJ_PROP_PARAMS) |
+FX_BOOL app::formsVersion(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError) |
{ |
if (vp.IsGetting()) |
{ |
@@ -240,7 +240,7 @@ FX_BOOL app::formsVersion(OBJ_PROP_PARAMS) |
return FALSE; |
} |
-FX_BOOL app::viewerType(OBJ_PROP_PARAMS) |
+FX_BOOL app::viewerType(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError) |
{ |
if (vp.IsGetting()) |
{ |
@@ -251,7 +251,7 @@ FX_BOOL app::viewerType(OBJ_PROP_PARAMS) |
return FALSE; |
} |
-FX_BOOL app::viewerVariation(OBJ_PROP_PARAMS) |
+FX_BOOL app::viewerVariation(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError) |
{ |
if (vp.IsGetting()) |
{ |
@@ -262,7 +262,7 @@ FX_BOOL app::viewerVariation(OBJ_PROP_PARAMS) |
return FALSE; |
} |
-FX_BOOL app::viewerVersion(OBJ_PROP_PARAMS) |
+FX_BOOL app::viewerVersion(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError) |
{ |
if (vp.IsGetting()) |
{ |
@@ -273,7 +273,7 @@ FX_BOOL app::viewerVersion(OBJ_PROP_PARAMS) |
return FALSE; |
} |
-FX_BOOL app::platform(OBJ_PROP_PARAMS) |
+FX_BOOL app::platform(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError) |
{ |
if (vp.IsGetting()) |
{ |
@@ -284,7 +284,7 @@ FX_BOOL app::platform(OBJ_PROP_PARAMS) |
return FALSE; |
} |
-FX_BOOL app::language(OBJ_PROP_PARAMS) |
+FX_BOOL app::language(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError) |
{ |
if (vp.IsGetting()) |
{ |
@@ -299,7 +299,7 @@ FX_BOOL app::language(OBJ_PROP_PARAMS) |
//comment: need reader support |
//note: |
//CFDF_Document * CPDFDoc_Environment::NewFDF(); |
-FX_BOOL app::newFDF(OBJ_METHOD_PARAMS) |
+FX_BOOL app::newFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
return TRUE; |
} |
@@ -308,12 +308,12 @@ FX_BOOL app::newFDF(OBJ_METHOD_PARAMS) |
//note: as defined in js reference, the proto of this function's fourth parmeters, how old an fdf document while do not show it. |
//CFDF_Document * CPDFDoc_Environment::OpenFDF(string strPath,bool bUserConv); |
-FX_BOOL app::openFDF(OBJ_METHOD_PARAMS) |
+FX_BOOL app::openFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
return TRUE; |
} |
-FX_BOOL app::alert(OBJ_METHOD_PARAMS) |
+FX_BOOL app::alert(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
int iSize = params.size(); |
if (iSize < 1) |
@@ -438,7 +438,7 @@ FX_BOOL app::alert(OBJ_METHOD_PARAMS) |
} |
-FX_BOOL app::beep(OBJ_METHOD_PARAMS) |
+FX_BOOL app::beep(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
if (params.size() == 1) |
{ |
@@ -456,22 +456,22 @@ FX_BOOL app::beep(OBJ_METHOD_PARAMS) |
} |
} |
-FX_BOOL app::findComponent(OBJ_METHOD_PARAMS) |
+FX_BOOL app::findComponent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
return TRUE; |
} |
-FX_BOOL app::popUpMenuEx(OBJ_METHOD_PARAMS) |
+FX_BOOL app::popUpMenuEx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
return FALSE; |
} |
-FX_BOOL app::fs(OBJ_PROP_PARAMS) |
+FX_BOOL app::fs(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError) |
{ |
return FALSE; |
} |
-FX_BOOL app::setInterval(OBJ_METHOD_PARAMS) |
+FX_BOOL app::setInterval(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
if (params.size() > 2 || params.size() == 0) |
{ |
@@ -520,7 +520,7 @@ FX_BOOL app::setInterval(OBJ_METHOD_PARAMS) |
return TRUE; |
} |
-FX_BOOL app::setTimeOut(OBJ_METHOD_PARAMS) |
+FX_BOOL app::setTimeOut(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
if (params.size() > 2 || params.size() == 0) |
{ |
@@ -571,7 +571,7 @@ FX_BOOL app::setTimeOut(OBJ_METHOD_PARAMS) |
return TRUE; |
} |
-FX_BOOL app::clearTimeOut(OBJ_METHOD_PARAMS) |
+FX_BOOL app::clearTimeOut(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
CJS_Context* pContext = (CJS_Context*)cc; |
ASSERT(pContext != NULL); |
@@ -619,7 +619,7 @@ FX_BOOL app::clearTimeOut(OBJ_METHOD_PARAMS) |
return TRUE; |
} |
-FX_BOOL app::clearInterval(OBJ_METHOD_PARAMS) |
+FX_BOOL app::clearInterval(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
CJS_Context* pContext = (CJS_Context*)cc; |
ASSERT(pContext != NULL); |
@@ -667,7 +667,7 @@ FX_BOOL app::clearInterval(OBJ_METHOD_PARAMS) |
return TRUE; |
} |
-FX_BOOL app::execMenuItem(OBJ_METHOD_PARAMS) |
+FX_BOOL app::execMenuItem(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
return FALSE; |
} |
@@ -707,19 +707,19 @@ void app::RunJsScript(CJS_Runtime* pRuntime,const CFX_WideString& wsScript) |
} |
} |
-FX_BOOL app::goBack(OBJ_METHOD_PARAMS) |
+FX_BOOL app::goBack(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
// Not supported. |
return TRUE; |
} |
-FX_BOOL app::goForward(OBJ_METHOD_PARAMS) |
+FX_BOOL app::goForward(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
// Not supported. |
return TRUE; |
} |
-FX_BOOL app::mailMsg(OBJ_METHOD_PARAMS) |
+FX_BOOL app::mailMsg(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
CJS_Context* pContext = (CJS_Context*)cc; |
ASSERT(pContext != NULL); |
@@ -783,13 +783,13 @@ FX_BOOL app::mailMsg(OBJ_METHOD_PARAMS) |
return FALSE; |
} |
-FX_BOOL app::launchURL(OBJ_METHOD_PARAMS) |
+FX_BOOL app::launchURL(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
// Unsafe, not supported. |
return TRUE; |
} |
-FX_BOOL app::runtimeHighlight(OBJ_PROP_PARAMS) |
+FX_BOOL app::runtimeHighlight(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError) |
{ |
if (vp.IsSetting()) |
{ |
@@ -803,18 +803,18 @@ FX_BOOL app::runtimeHighlight(OBJ_PROP_PARAMS) |
return TRUE; |
} |
-FX_BOOL app::fullscreen(OBJ_PROP_PARAMS) |
+FX_BOOL app::fullscreen(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError) |
{ |
return FALSE; |
} |
-FX_BOOL app::popUpMenu(OBJ_METHOD_PARAMS) |
+FX_BOOL app::popUpMenu(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
return FALSE; |
} |
-FX_BOOL app::browseForDoc(OBJ_METHOD_PARAMS) |
+FX_BOOL app::browseForDoc(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
// Unsafe, not supported. |
return TRUE; |
@@ -846,17 +846,17 @@ CFX_WideString app::SysPathToPDFPath(const CFX_WideString& sOldPath) |
return sRet; |
} |
-FX_BOOL app::newDoc(OBJ_METHOD_PARAMS) |
+FX_BOOL app::newDoc(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
return FALSE; |
} |
-FX_BOOL app::openDoc(OBJ_METHOD_PARAMS) |
+FX_BOOL app::openDoc(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
return FALSE; |
} |
-FX_BOOL app::response(OBJ_METHOD_PARAMS) |
+FX_BOOL app::response(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
CFX_WideString swQuestion = L""; |
CFX_WideString swLabel = L""; |
@@ -936,12 +936,12 @@ FX_BOOL app::response(OBJ_METHOD_PARAMS) |
return TRUE; |
} |
-FX_BOOL app::media(OBJ_PROP_PARAMS) |
+FX_BOOL app::media(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError) |
{ |
return FALSE; |
} |
-FX_BOOL app::execDialog(OBJ_METHOD_PARAMS) |
+FX_BOOL app::execDialog(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError) |
{ |
return TRUE; |
} |