From cd19666307d7fd97e4624a3df9bf3daaacaa473e Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 29 Jul 2013 16:35:25 +0800 Subject: [PATCH] Remove the useless remote.getObject API. --- browser/atom/objects-registry.coffee | 10 ++-------- browser/atom/rpc-server.coffee | 7 ------- renderer/api/lib/remote.coffee | 5 ----- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/browser/atom/objects-registry.coffee b/browser/atom/objects-registry.coffee index 5f4ce62272c8..c60093167bdc 100644 --- a/browser/atom/objects-registry.coffee +++ b/browser/atom/objects-registry.coffee @@ -6,7 +6,7 @@ class ObjectsStore @stores = {} constructor: -> - @nextId = 1 + @nextId = 0 @objects = [] getNextId: -> @@ -48,13 +48,7 @@ objectsWeakMap.add = (obj) -> windowsWeakMap = new IDWeakMap process.on 'ATOM_BROWSER_INTERNAL_NEW', (obj) -> - # It's possible that user created a object in browser side and then want to - # get it in renderer via remote.getObject. So we must add every native object - # created in browser to the weak map even it may not be referenced by the - # renderer. - objectsWeakMap.add obj - - # Also remember all windows. + # Remember all windows. if obj.constructor is BrowserWindow id = windowsWeakMap.add obj obj.on 'destroyed', -> diff --git a/browser/atom/rpc-server.coffee b/browser/atom/rpc-server.coffee index 2e0c9eb9913e..879a80dcbbe0 100644 --- a/browser/atom/rpc-server.coffee +++ b/browser/atom/rpc-server.coffee @@ -116,12 +116,5 @@ ipc.on 'ATOM_BROWSER_MEMBER_GET', (event, processId, routingId, id, name) -> catch e event.result = errorToMeta e -ipc.on 'ATOM_BROWSER_REFERENCE', (event, processId, routingId, id) -> - try - obj = objectsRegistry.get id - event.result = valueToMeta processId, routingId, obj - catch e - event.result = errorToMeta e - ipc.on 'ATOM_BROWSER_DEREFERENCE', (processId, routingId, storeId) -> objectsRegistry.remove processId, routingId, storeId diff --git a/renderer/api/lib/remote.coffee b/renderer/api/lib/remote.coffee index b79c8d0697cf..ae08d94b31ff 100644 --- a/renderer/api/lib/remote.coffee +++ b/renderer/api/lib/remote.coffee @@ -96,11 +96,6 @@ exports.require = (module) -> meta = ipc.sendChannelSync 'ATOM_BROWSER_REQUIRE', module moduleCache[module] = metaToValue meta -# Get object with specified id. -exports.getObject = (id) -> - meta = ipc.sendChannelSync 'ATOM_BROWSER_REFERENCE', id - metaToValue meta - # Get current window object. windowCache = null exports.getCurrentWindow = ->