mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #29 from electron/revert-c66-change

Browse source 
Revert "Address breaking API"
This commit is contained in:
Shelley Vohr 2018-04-15 13:48:22 -04:00 committed by GitHub
commit bb2fb93355
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
native_mate/constructor.h
View file

@ -127,7 +127,7 @@ MATE_METHOD_RETURN_TYPE InvokeNew(const base::Callback<Sig>& factory,
WrappableBase* object; WrappableBase* object;
{ {
// Don't continue if the constructor throws an exception. // Don't continue if the constructor throws an exception.
v8::TryCatch try_catch(isolate); v8::TryCatch try_catch;
object = internal::InvokeFactory(args, factory); object = internal::InvokeFactory(args, factory);
if (try_catch.HasCaught()) { if (try_catch.HasCaught()) {
try_catch.ReThrow(); try_catch.ReThrow();

2
native_mate/object_template_builder.h
View file

@ -69,7 +69,7 @@ class ObjectTemplateBuilder {
public: public:
explicit ObjectTemplateBuilder( explicit ObjectTemplateBuilder(
v8::Isolate* isolate, v8::Isolate* isolate,
v8::Local<v8::ObjectTemplate> templ); v8::Local<v8::ObjectTemplate> templ = v8::ObjectTemplate::New());
~ObjectTemplateBuilder(); ~ObjectTemplateBuilder();
// It's against Google C++ style to return a non-const ref, but we take some // It's against Google C++ style to return a non-const ref, but we take some