github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-05-02 03:00:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 7dff37844cb3 (master) (#18059)

Browse Source
This commit is contained in:
Electron Bot
2019-04-30 20:18:22 -04:00
committed by Jeremy Apthorp
parent 00358545a9
commit 2616911f7a
77 changed files with 1636 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
atom/renderer/atom_sandboxed_renderer_client.cc
View File

@@ -110,7 +110,7 @@ void InvokeHiddenCallback(v8::Handle<v8::Context> context,
auto callback_key = mate::ConvertToV8(isolate, callback_name)
->ToString(context)
.ToLocalChecked();
auto callback_value = binding->Get(callback_key);
auto callback_value = binding->Get(context, callback_key).ToLocalChecked();
DCHECK(callback_value->IsFunction()); // set by sandboxed_renderer/init.js
auto callback = v8::Handle<v8::Function>::Cast(callback_value);
ignore_result(callback->Call(context, binding, 0, nullptr));

2
atom/renderer/electron_api_service_impl.cc
View File

@@ -60,7 +60,7 @@ void InvokeIpcCallback(v8::Local<v8::Context> context,
auto callback_key = mate::ConvertToV8(isolate, callback_name)
->ToString(context)
.ToLocalChecked();
auto callback_value = ipcNative->Get(callback_key);
auto callback_value = ipcNative->Get(context, callback_key).ToLocalChecked();
DCHECK(callback_value->IsFunction()); // set by init.ts
auto callback = v8::Local<v8::Function>::Cast(callback_value);
ignore_result(callback->Call(context, ipcNative, args.size(), args.data()));