summaryrefslogtreecommitdiff
path: root/fxjs/cjs_return.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-06-08 18:23:05 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-06-08 18:23:05 +0000
commit1699982f45d01cb18585eba80cce5326a63d3b67 (patch)
tree537d81d989632bab75fda37f5b587e1309e60d5d /fxjs/cjs_return.cpp
parentf29479d47156d180c0b71f6c98aa4de37c2a7ee2 (diff)
downloadpdfium-1699982f45d01cb18585eba80cce5326a63d3b67.tar.xz
Ensure CJS_Return() with error always includes a message.
Change the signature of the constructors to make it impossible to do this otherwise. Change-Id: I14e88d98a1128f2d599459ce9337cd6d079469fe Reviewed-on: https://pdfium-review.googlesource.com/34531 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs/cjs_return.cpp')
-rw-r--r--fxjs/cjs_return.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/fxjs/cjs_return.cpp b/fxjs/cjs_return.cpp
index adfd1c5c9f..53ac5c0a28 100644
--- a/fxjs/cjs_return.cpp
+++ b/fxjs/cjs_return.cpp
@@ -6,13 +6,15 @@
#include "fxjs/cjs_return.h"
-CJS_Return::CJS_Return(bool result) : is_error_(!result) {}
-
-CJS_Return::CJS_Return(const WideString& err) : is_error_(true), error_(err) {}
+CJS_Return::CJS_Return() : is_error_(false) {}
CJS_Return::CJS_Return(v8::Local<v8::Value> ret)
: is_error_(false), return_(ret) {}
+CJS_Return::CJS_Return(const WideString& err) : is_error_(true), error_(err) {}
+
+CJS_Return::CJS_Return(JSMessage id) : CJS_Return(JSGetStringFromID(id)) {}
+
CJS_Return::CJS_Return(const CJS_Return&) = default;
CJS_Return::~CJS_Return() = default;