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

refactor: remove private webContents.getId() API (#13674)

Browse source
This commit is contained in:
Cheng Zhao 2018-07-23 18:08:36 +09:00 • committed by GitHub
parent a88cdf2d1f
commit 305e3aad40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 14 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/browser/rpc-server.js
View file

@ -210,9 +210,9 @@ const unwrapArgs = function (sender, contextId, args) {
return rendererFunctions.get(objectId)
}
const webContentsId = sender.getId()
const processId = sender.getProcessId()
let callIntoRenderer = function (...args) {
if (!sender.isDestroyed() && webContentsId === sender.getId()) {
if (!sender.isDestroyed() && processId === sender.getProcessId()) {
sender.send('ELECTRON_RENDERER_CALLBACK', contextId, meta.id, valueToMeta(sender, contextId, args))
} else {
removeRemoteListenersAndLogWarning(this, meta, callIntoRenderer)
@ -453,7 +453,6 @@ ipcMain.on('ELECTRON_BROWSER_SANDBOX_LOAD', function (event, preloadPath) {
event.returnValue = {
preloadSrc: preloadSrc,
preloadError: preloadError,
webContentsId: event.sender.getId(),
platform: process.platform,
execPath: process.execPath,
env: process.env