Left: | ||
Right: |
OLD | NEW |
---|---|
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 Eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 18 matching lines...) Expand all Loading... | |
29 require("synchronizer"); | 29 require("synchronizer"); |
30 require("notification"); | 30 require("notification"); |
31 require("sync"); | 31 require("sync"); |
32 require("messageResponder"); | 32 require("messageResponder"); |
33 require("ui"); | 33 require("ui"); |
34 require("objectTabs"); | 34 require("objectTabs"); |
35 | 35 |
36 function bootstrapChildProcesses() | 36 function bootstrapChildProcesses() |
37 { | 37 { |
38 let info = require("info"); | 38 let info = require("info"); |
39 let {Utils} = require("utils"); | |
40 Utils.addChildMessageListener("AdblockPlus:GetInfo", () => info); | |
41 | 39 |
42 let processScript = info.addonRoot + "lib/child/bootstrap.js?" + Math.random() ; | 40 let processScript = info.addonRoot + "lib/child/bootstrap.js?" + |
41 Math.random() + "#" + encodeURIComponent(JSON.stringify(info)); | |
Thomas Greiner
2016/03/23 14:09:20
That looks a bit hacky and not easily extensible.
Wladimir Palant
2016/03/23 15:29:33
I don't think extensibility matters here. I've imp
| |
43 let messageManager = Cc["@mozilla.org/parentprocessmessagemanager;1"] | 42 let messageManager = Cc["@mozilla.org/parentprocessmessagemanager;1"] |
44 .getService(Ci.nsIProcessScriptLoader) | 43 .getService(Ci.nsIProcessScriptLoader) |
45 .QueryInterface(Ci.nsIMessageBroadcaster); | 44 .QueryInterface(Ci.nsIMessageBroadcaster); |
46 messageManager.loadProcessScript(processScript, true); | 45 messageManager.loadProcessScript(processScript, true); |
47 | 46 |
48 onShutdown.add(() => { | 47 onShutdown.add(() => { |
49 messageManager.broadcastAsyncMessage("AdblockPlus:Shutdown", processScript); | 48 messageManager.broadcastAsyncMessage("AdblockPlus:Shutdown", processScript); |
50 messageManager.removeDelayedProcessScript(processScript); | 49 messageManager.removeDelayedProcessScript(processScript); |
51 }); | 50 }); |
52 } | 51 } |
(...skipping 21 matching lines...) Expand all Loading... | |
74 | 73 |
75 let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar); | 74 let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar); |
76 registrar.registerFactory(classID, "Adblock Plus public API URL", contractID, factory); | 75 registrar.registerFactory(classID, "Adblock Plus public API URL", contractID, factory); |
77 | 76 |
78 onShutdown.add(function() | 77 onShutdown.add(function() |
79 { | 78 { |
80 registrar.unregisterFactory(classID, factory); | 79 registrar.unregisterFactory(classID, factory); |
81 Cu.unload(uri.spec); | 80 Cu.unload(uri.spec); |
82 }); | 81 }); |
83 } | 82 } |
OLD | NEW |