diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-12-11 22:01:08 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-11 22:01:08 +0000 |
| commit | cb22f9ad9265f40b1104ed2b09488ccc6ec9e5aa (patch) | |
| tree | 4aaa14dfb0528268fb9a9a94a4cac82df1af4602 /fxjs/cjx_object.cpp | |
| parent | 731526e3b9f32ceac1cdac600fe3ecd55a0bc9b5 (diff) | |
| download | pdfium-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 'fxjs/cjx_object.cpp')
| -rw-r--r-- | fxjs/cjx_object.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fxjs/cjx_object.cpp b/fxjs/cjx_object.cpp index 21eb3c8921..fbbcc00365 100644 --- a/fxjs/cjx_object.cpp +++ b/fxjs/cjx_object.cpp @@ -6,12 +6,13 @@ #include "fxjs/cjx_object.h" -#include <map> #include <utility> #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/xml/cfx_xmltext.h" +#include "fxjs/cfxjse_engine.h" #include "fxjs/cfxjse_value.h" +#include "fxjs/cjs_return.h" #include "third_party/base/ptr_util.h" #include "xfa/fxfa/cxfa_ffnotify.h" #include "xfa/fxfa/cxfa_ffwidget.h" @@ -103,11 +104,14 @@ bool CJX_Object::HasMethod(const WideString& func) const { return pdfium::ContainsKey(method_specs_, func.UTF8Encode()); } -void CJX_Object::RunMethod(const WideString& func, CFXJSE_Arguments* args) { +CJS_Return CJX_Object::RunMethod( + const WideString& func, + const std::vector<v8::Local<v8::Value>>& params) { auto it = method_specs_.find(func.UTF8Encode()); if (it == method_specs_.end()) - return; - it->second(this, args); + return CJS_Return(false); + return it->second(this, GetXFAObject()->GetDocument()->GetScriptContext(), + params); } void CJX_Object::ThrowInvalidPropertyException() const { |