summaryrefslogtreecommitdiff
path: root/xfa/fxfa
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-12-11 22:01:08 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-12-11 22:01:08 +0000
commitcb22f9ad9265f40b1104ed2b09488ccc6ec9e5aa (patch)
tree4aaa14dfb0528268fb9a9a94a4cac82df1af4602 /xfa/fxfa
parent731526e3b9f32ceac1cdac600fe3ecd55a0bc9b5 (diff)
downloadpdfium-cb22f9ad9265f40b1104ed2b09488ccc6ec9e5aa.tar.xz
[xfa] Refactor CJX method signatures.
This CL changes the CJX methods from void (*)(CFXJSE_Arguments*) to CJS_Return (*)(CJS_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) which is closer to how CJS works in practice. Change-Id: I3a3129268acfe4262dfeb04179919ed19f6c24e1 Reviewed-on: https://pdfium-review.googlesource.com/20491 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa')
-rw-r--r--xfa/fxfa/cxfa_widgetacc.cpp2
-rw-r--r--xfa/fxfa/fxfa_basic.h10
-rw-r--r--xfa/fxfa/parser/cscript_datawindow.cpp1
-rw-r--r--xfa/fxfa/parser/cscript_eventpseudomodel.cpp1
-rw-r--r--xfa/fxfa/parser/cscript_hostpseudomodel.cpp1
-rw-r--r--xfa/fxfa/parser/cscript_layoutpseudomodel.cpp1
-rw-r--r--xfa/fxfa/parser/cscript_logpseudomodel.cpp1
-rw-r--r--xfa/fxfa/parser/cscript_signaturepseudomodel.cpp1
8 files changed, 1 insertions, 17 deletions
diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp
index ef5904c946..86d1da5ed4 100644
--- a/xfa/fxfa/cxfa_widgetacc.cpp
+++ b/xfa/fxfa/cxfa_widgetacc.cpp
@@ -607,7 +607,7 @@ std::pair<int32_t, bool> CXFA_WidgetAcc::ExecuteBoolScript(
pContext->SetNodesOfRunScript(&refNodes);
}
- auto pTmpRetValue = pdfium::MakeUnique<CFXJSE_Value>(pContext->GetRuntime());
+ auto pTmpRetValue = pdfium::MakeUnique<CFXJSE_Value>(pContext->GetIsolate());
++m_nRecursionDepth;
bool bRet = pContext->RunScript(eScriptType, wsExpression.AsStringView(),
pTmpRetValue.get(), m_pNode);
diff --git a/xfa/fxfa/fxfa_basic.h b/xfa/fxfa/fxfa_basic.h
index b5acd2df40..96b483d978 100644
--- a/xfa/fxfa/fxfa_basic.h
+++ b/xfa/fxfa/fxfa_basic.h
@@ -7,10 +7,8 @@
#ifndef XFA_FXFA_FXFA_BASIC_H_
#define XFA_FXFA_FXFA_BASIC_H_
-#include "fxjs/cfxjse_arguments.h"
#include "fxjs/fxjse.h"
-class CFXJSE_Arguments;
class CJX_Object;
class CXFA_Measurement;
enum class XFA_ObjectType;
@@ -966,14 +964,6 @@ enum class XFA_Unit : uint8_t {
Unknown = 255,
};
-typedef void (CJX_Object::*XFA_METHOD_CALLBACK)(CFXJSE_Arguments* pArguments);
-
-struct XFA_METHODINFO {
- uint32_t uHash;
- const wchar_t* pName;
- XFA_METHOD_CALLBACK callback;
-};
-
typedef void (CJX_Object::*XFA_ATTRIBUTE_CALLBACK)(CFXJSE_Value* pValue,
bool bSetting,
XFA_Attribute eAttribute);
diff --git a/xfa/fxfa/parser/cscript_datawindow.cpp b/xfa/fxfa/parser/cscript_datawindow.cpp
index e8ffdaa114..25ad589fe5 100644
--- a/xfa/fxfa/parser/cscript_datawindow.cpp
+++ b/xfa/fxfa/parser/cscript_datawindow.cpp
@@ -6,7 +6,6 @@
#include "xfa/fxfa/parser/cscript_datawindow.h"
-#include "fxjs/cfxjse_arguments.h"
#include "fxjs/cjx_datawindow.h"
#include "third_party/base/ptr_util.h"
#include "xfa/fxfa/parser/cxfa_document.h"
diff --git a/xfa/fxfa/parser/cscript_eventpseudomodel.cpp b/xfa/fxfa/parser/cscript_eventpseudomodel.cpp
index c09ba76c47..8f4e049a4f 100644
--- a/xfa/fxfa/parser/cscript_eventpseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_eventpseudomodel.cpp
@@ -6,7 +6,6 @@
#include "xfa/fxfa/parser/cscript_eventpseudomodel.h"
-#include "fxjs/cfxjse_arguments.h"
#include "fxjs/cjx_object.h"
#include "third_party/base/ptr_util.h"
diff --git a/xfa/fxfa/parser/cscript_hostpseudomodel.cpp b/xfa/fxfa/parser/cscript_hostpseudomodel.cpp
index 9ca3828961..8122aa32f7 100644
--- a/xfa/fxfa/parser/cscript_hostpseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_hostpseudomodel.cpp
@@ -6,7 +6,6 @@
#include "xfa/fxfa/parser/cscript_hostpseudomodel.h"
-#include "fxjs/cfxjse_arguments.h"
#include "third_party/base/ptr_util.h"
CScript_HostPseudoModel::CScript_HostPseudoModel(CXFA_Document* pDocument)
diff --git a/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp b/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp
index 675e79531e..73033d5bea 100644
--- a/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp
@@ -6,7 +6,6 @@
#include "xfa/fxfa/parser/cscript_layoutpseudomodel.h"
-#include "fxjs/cfxjse_arguments.h"
#include "third_party/base/ptr_util.h"
CScript_LayoutPseudoModel::CScript_LayoutPseudoModel(CXFA_Document* pDocument)
diff --git a/xfa/fxfa/parser/cscript_logpseudomodel.cpp b/xfa/fxfa/parser/cscript_logpseudomodel.cpp
index 7a9c410aba..1c2d80204c 100644
--- a/xfa/fxfa/parser/cscript_logpseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_logpseudomodel.cpp
@@ -6,7 +6,6 @@
#include "xfa/fxfa/parser/cscript_logpseudomodel.h"
-#include "fxjs/cfxjse_arguments.h"
#include "third_party/base/ptr_util.h"
CScript_LogPseudoModel::CScript_LogPseudoModel(CXFA_Document* pDocument)
diff --git a/xfa/fxfa/parser/cscript_signaturepseudomodel.cpp b/xfa/fxfa/parser/cscript_signaturepseudomodel.cpp
index a8a67429be..c5f4e6425f 100644
--- a/xfa/fxfa/parser/cscript_signaturepseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_signaturepseudomodel.cpp
@@ -6,7 +6,6 @@
#include "xfa/fxfa/parser/cscript_signaturepseudomodel.h"
-#include "fxjs/cfxjse_arguments.h"
#include "third_party/base/ptr_util.h"
CScript_SignaturePseudoModel::CScript_SignaturePseudoModel(