From 1699982f45d01cb18585eba80cce5326a63d3b67 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 8 Jun 2018 18:23:05 +0000 Subject: 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 Commit-Queue: Tom Sepez --- fxjs/cjs_return.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'fxjs/cjs_return.h') diff --git a/fxjs/cjs_return.h b/fxjs/cjs_return.h index 37c91caafe..df3c8519bd 100644 --- a/fxjs/cjs_return.h +++ b/fxjs/cjs_return.h @@ -8,12 +8,14 @@ #define FXJS_CJS_RETURN_H_ #include "fxjs/cfxjs_engine.h" +#include "fxjs/js_resources.h" class CJS_Return { public: - explicit CJS_Return(bool); - explicit CJS_Return(const WideString&); - explicit CJS_Return(v8::Local); + CJS_Return(); // Successful but empty return. + explicit CJS_Return(v8::Local); // Successful return with value. + explicit CJS_Return(const WideString&); // Error with custom message. + explicit CJS_Return(JSMessage id); // Error with stock message. CJS_Return(const CJS_Return&); ~CJS_Return(); @@ -24,8 +26,6 @@ class CJS_Return { v8::Local Return() const { return return_; } private: - CJS_Return() = delete; - bool is_error_ = false; WideString error_; v8::Local return_; -- cgit v1.2.3