Fix circular reference caused by Object.defineProperty
This commit is contained in:
parent
3d2163230b
commit
ffc2870ccb
1 changed files with 15 additions and 12 deletions
|
@ -75,18 +75,7 @@ metaToValue = (meta) ->
|
||||||
if member.type is 'function'
|
if member.type is 'function'
|
||||||
ret[member.name] = createRemoteMemberFunction meta.id, member.name
|
ret[member.name] = createRemoteMemberFunction meta.id, member.name
|
||||||
else
|
else
|
||||||
do (member) ->
|
Object.defineProperty ret, member.name, createRemoteMemberProperty(meta.id, member.name)
|
||||||
Object.defineProperty ret, member.name,
|
|
||||||
enumerable: true,
|
|
||||||
configurable: false,
|
|
||||||
set: (value) ->
|
|
||||||
# Set member data.
|
|
||||||
ipcRenderer.sendSync 'ATOM_BROWSER_MEMBER_SET', meta.id, member.name, value
|
|
||||||
value
|
|
||||||
get: ->
|
|
||||||
# Get member data.
|
|
||||||
val = ipcRenderer.sendSync 'ATOM_BROWSER_MEMBER_GET', meta.id, member.name
|
|
||||||
metaToValue val
|
|
||||||
|
|
||||||
# Track delegate object's life time, and tell the browser to clean up
|
# Track delegate object's life time, and tell the browser to clean up
|
||||||
# when the object is GCed.
|
# when the object is GCed.
|
||||||
|
@ -121,6 +110,20 @@ createRemoteMemberFunction = (metaId, name) ->
|
||||||
ret = ipcRenderer.sendSync 'ATOM_BROWSER_MEMBER_CALL', metaId, name, wrapArgs(arguments)
|
ret = ipcRenderer.sendSync 'ATOM_BROWSER_MEMBER_CALL', metaId, name, wrapArgs(arguments)
|
||||||
return metaToValue ret
|
return metaToValue ret
|
||||||
|
|
||||||
|
# Create configuration for defineProperty.
|
||||||
|
# This function's content should not be inlined into metaToValue, otherwise V8
|
||||||
|
# may consider it circular reference.
|
||||||
|
createRemoteMemberProperty = (metaId, name) ->
|
||||||
|
enumerable: true,
|
||||||
|
configurable: false,
|
||||||
|
set: (value) ->
|
||||||
|
# Set member data.
|
||||||
|
ipcRenderer.sendSync 'ATOM_BROWSER_MEMBER_SET', metaId, name, value
|
||||||
|
value
|
||||||
|
get: ->
|
||||||
|
# Get member data.
|
||||||
|
metaToValue ipcRenderer.sendSync('ATOM_BROWSER_MEMBER_GET', metaId, name)
|
||||||
|
|
||||||
# Browser calls a callback in renderer.
|
# Browser calls a callback in renderer.
|
||||||
ipcRenderer.on 'ATOM_RENDERER_CALLBACK', (event, id, args) ->
|
ipcRenderer.on 'ATOM_RENDERER_CALLBACK', (event, id, args) ->
|
||||||
callbacksRegistry.apply id, metaToValue(args)
|
callbacksRegistry.apply id, metaToValue(args)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue