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

refactor: take advantage of structured clone algorithm in the remote module (#20427)

Browse source
This commit is contained in:
Milan Burda 2019-10-10 15:59:08 +02:00 • committed by John Kleinschmidt
parent c2e77e4429
commit b92163d226
13 changed files with 87 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,6 @@ const { crashReporterInit } = require('@electron/internal/browser/crash-reporter
const { ipcMainInternal } = require('@electron/internal/browser/ipc-main-internal')
const ipcMainUtils = require('@electron/internal/browser/ipc-main-internal-utils')
const guestViewManager = require('@electron/internal/browser/guest-view-manager')
const errorUtils = require('@electron/internal/common/error-utils')
const clipboardUtils = require('@electron/internal/common/clipboard-utils')
const emitCustomEvent = function (contents, eventName, ...args) {
@ -91,8 +90,8 @@ const getPreloadScript = async function (preloadPath) {
let preloadError = null
try {
preloadSrc = (await fs.promises.readFile(preloadPath)).toString()
} catch (err) {
preloadError = errorUtils.serialize(err)
} catch (error) {
preloadError = error
}
return { preloadPath, preloadSrc, preloadError }
}
@ -130,5 +129,5 @@ ipcMainUtils.handleSync('ELECTRON_BROWSER_SANDBOX_LOAD', async function (event)
})
ipcMainInternal.on('ELECTRON_BROWSER_PRELOAD_ERROR', function (event, preloadPath, error) {
event.sender.emit('preload-error', event, preloadPath, errorUtils.deserialize(error))
event.sender.emit('preload-error', event, preloadPath, error)
})