Merge pull request #30 from electron/chromium-66-upgrade
Chromium 66 Updates
This commit is contained in:
Коммит
e15ffd96eb
|
@ -127,7 +127,7 @@ void 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;
|
v8::TryCatch try_catch(isolate);
|
||||||
object = internal::InvokeFactory(args, factory);
|
object = internal::InvokeFactory(args, factory);
|
||||||
if (try_catch.HasCaught()) {
|
if (try_catch.HasCaught()) {
|
||||||
try_catch.ReThrow();
|
try_catch.ReThrow();
|
||||||
|
|
|
@ -69,7 +69,7 @@ class ObjectTemplateBuilder {
|
||||||
public:
|
public:
|
||||||
explicit ObjectTemplateBuilder(
|
explicit ObjectTemplateBuilder(
|
||||||
v8::Isolate* isolate,
|
v8::Isolate* isolate,
|
||||||
v8::Local<v8::ObjectTemplate> templ = v8::ObjectTemplate::New());
|
v8::Local<v8::ObjectTemplate> templ);
|
||||||
~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
|
||||||
|
|
Загрузка…
Ссылка в новой задаче