diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-08-17 16:44:50 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-17 16:44:50 +0000 |
commit | 20736f7f5884cf1e2827543c92b6e47f8282aeaf (patch) | |
tree | 9a0f3cbd9262d1676f70ab02c3fa5b4e0acaa03a /fxjs/xfa/cjx_source.cpp | |
parent | 21068062a038db72b5ee40512fe638acbdd17c3d (diff) | |
download | pdfium-20736f7f5884cf1e2827543c92b6e47f8282aeaf.tar.xz |
Introduce safer CJS_Return::Success() and Failure().
Avoid the possibility of ever re-introducing the issue noticed
last week.
Remove some redundant JSGetStringFromID() calls.
Change-Id: I56687c2191bd72e378f747083f34080e50cbe490
Reviewed-on: https://pdfium-review.googlesource.com/40490
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs/xfa/cjx_source.cpp')
-rw-r--r-- | fxjs/xfa/cjx_source.cpp | 85 |
1 files changed, 51 insertions, 34 deletions
diff --git a/fxjs/xfa/cjx_source.cpp b/fxjs/xfa/cjx_source.cpp index 933229e07c..0b24b8f4b4 100644 --- a/fxjs/xfa/cjx_source.cpp +++ b/fxjs/xfa/cjx_source.cpp @@ -40,126 +40,143 @@ CJX_Source::~CJX_Source() {} CJS_Return CJX_Source::next(CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::cancelBatch( CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::first(CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::updateBatch( CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::previous( CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::isBOF(CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::isEOF(CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::cancel(CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::update(CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::open(CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::deleteItem( CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::addNew(CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::requery( CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::resync(CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::close(CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::last(CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } CJS_Return CJX_Source::hasDataChanged( CFX_V8* runtime, const std::vector<v8::Local<v8::Value>>& params) { if (!params.empty()) - return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(); + return CJS_Return::Failure(JSMessage::kParamError); + + return CJS_Return::Success(); } void CJX_Source::db(CFXJSE_Value* pValue, |