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

Fix circular reference caused by RemoteMemberFunction

Browse source
This commit is contained in:
Cheng Zhao 2015-12-28 22:31:14 +08:00
parent 6fe39e79f4
commit b5fd491c2d
1 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
atom/renderer/api/lib/remote.coffee
View file

@ -72,20 +72,10 @@ metaToValue = (meta) ->
# Polulate delegate members. # Polulate delegate members.
for member in meta.members for member in meta.members
do (member) -> if member.type is 'function'
if member.type is 'function' ret[member.name] = createRemoteMemberFunction meta.id, member.name
ret[member.name] = else
class RemoteMemberFunction do (member) ->
constructor: ->
if @constructor is RemoteMemberFunction
# Constructor call.
obj = ipcRenderer.sendSync 'ATOM_BROWSER_MEMBER_CONSTRUCTOR', meta.id, member.name, wrapArgs(arguments)
return metaToValue obj
else
# Call member function.
ret = ipcRenderer.sendSync 'ATOM_BROWSER_MEMBER_CALL', meta.id, member.name, wrapArgs(arguments)
return metaToValue ret
else
Object.defineProperty ret, member.name, Object.defineProperty ret, member.name,
enumerable: true, enumerable: true,
configurable: false, configurable: false,
@ -93,11 +83,10 @@ metaToValue = (meta) ->
# Set member data. # Set member data.
ipcRenderer.sendSync 'ATOM_BROWSER_MEMBER_SET', meta.id, member.name, value ipcRenderer.sendSync 'ATOM_BROWSER_MEMBER_SET', meta.id, member.name, value
value value
get: -> get: ->
# Get member data. # Get member data.
ret = ipcRenderer.sendSync 'ATOM_BROWSER_MEMBER_GET', meta.id, member.name val = ipcRenderer.sendSync 'ATOM_BROWSER_MEMBER_GET', meta.id, member.name
metaToValue ret 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.
@ -117,6 +106,21 @@ metaToPlainObject = (meta) ->
obj[name] = value for {name, value} in meta.members obj[name] = value for {name, value} in meta.members
obj obj
# Create a RemoteMemberFunction instance.
# This function's content should not be inlined into metaToValue, otherwise V8
# may consider it circular reference.
createRemoteMemberFunction = (metaId, name) ->
class RemoteMemberFunction
constructor: ->
if @constructor is RemoteMemberFunction
# Constructor call.
ret = ipcRenderer.sendSync 'ATOM_BROWSER_MEMBER_CONSTRUCTOR', metaId, name, wrapArgs(arguments)
return metaToValue ret
else
# Call member function.
ret = ipcRenderer.sendSync 'ATOM_BROWSER_MEMBER_CALL', metaId, name, wrapArgs(arguments)
return metaToValue ret
# 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)