summaryrefslogtreecommitdiff
path: root/fxjs
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-07-12 19:05:10 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-07-12 19:05:10 +0000
commit47aff85a5f80cc3cd3a7c55869ab777c407bbf11 (patch)
treeb74a52e4c11835e7483e0397dd49f58784a6fc79 /fxjs
parentec4d28f844e72dbe47b9c6d464abc04d947b4bf5 (diff)
downloadpdfium-47aff85a5f80cc3cd3a7c55869ab777c407bbf11.tar.xz
Use pdfium::Optional in CJS_Return.
Change-Id: Idfe70f86fbaf341ba6b197689a65ac722e671f39 Reviewed-on: https://pdfium-review.googlesource.com/37674 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fxjs')
-rw-r--r--fxjs/cjs_return.cpp7
-rw-r--r--fxjs/cjs_return.h8
2 files changed, 7 insertions, 8 deletions
diff --git a/fxjs/cjs_return.cpp b/fxjs/cjs_return.cpp
index 53ac5c0a28..49ad54ab07 100644
--- a/fxjs/cjs_return.cpp
+++ b/fxjs/cjs_return.cpp
@@ -6,12 +6,11 @@
#include "fxjs/cjs_return.h"
-CJS_Return::CJS_Return() : is_error_(false) {}
+CJS_Return::CJS_Return() {}
-CJS_Return::CJS_Return(v8::Local<v8::Value> ret)
- : is_error_(false), return_(ret) {}
+CJS_Return::CJS_Return(v8::Local<v8::Value> ret) : return_(ret) {}
-CJS_Return::CJS_Return(const WideString& err) : is_error_(true), error_(err) {}
+CJS_Return::CJS_Return(const WideString& err) : error_(err) {}
CJS_Return::CJS_Return(JSMessage id) : CJS_Return(JSGetStringFromID(id)) {}
diff --git a/fxjs/cjs_return.h b/fxjs/cjs_return.h
index df3c8519bd..b165f3f11c 100644
--- a/fxjs/cjs_return.h
+++ b/fxjs/cjs_return.h
@@ -9,6 +9,7 @@
#include "fxjs/cfxjs_engine.h"
#include "fxjs/js_resources.h"
+#include "third_party/base/optional.h"
class CJS_Return {
public:
@@ -19,15 +20,14 @@ class CJS_Return {
CJS_Return(const CJS_Return&);
~CJS_Return();
- bool HasError() const { return is_error_; }
- WideString Error() const { return error_; }
+ bool HasError() const { return error_.has_value(); }
+ WideString Error() const { return error_.value(); }
bool HasReturn() const { return !return_.IsEmpty(); }
v8::Local<v8::Value> Return() const { return return_; }
private:
- bool is_error_ = false;
- WideString error_;
+ Optional<WideString> error_;
v8::Local<v8::Value> return_;
};