Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-01 17:23:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1389718 fix receiving a message in proxy sandbox when running OOP, r=kmag

Browse Source 
MozReview-Commit-ID: xgHIph36SG

--HG--
extra : rebase_source : 90010f086b713f7308d0f0367d96f6f79284b28a
This commit is contained in:
Shane Caraveo 2017-08-24 12:49:56 -07:00
parent 9a9c3cc30f
commit 66f20a68a1
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
toolkit/components/extensions/ExtensionParent.jsm
View File

@ -224,14 +224,14 @@ ProxyMessenger = {
responseType,
});
if (!extension.isEmbedded || !extension.remote) {
if (!(extension.isEmbedded || recipient.toProxyScript) || !extension.remote) {
return promise1;
}
// If we have a remote, embedded extension, the legacy side is
// running in a different process than the WebExtension side.
// As a result, we need to dispatch the message to both the parent
// and extension processes, and manually merge the results.
// If we have a proxy script sandbox or a remote, embedded extension, where
// the legacy side is running in a different process than the WebExtension
// side. As a result, we need to dispatch the message to both the parent and
// extension processes, and manually merge the results.
let promise2 = MessageChannel.sendMessage(Services.ppmm.getChildAt(0), messageName, data, {
sender,
recipient,

1
toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
View File

@ -69,3 +69,4 @@ skip-if = os == "android" # checking for telemetry needs to be updated: 1384923
skip-if = os == "android"
[test_native_messaging.js]
skip-if = os == "android"
[test_proxy_scripts.js]

2
toolkit/components/extensions/test/xpcshell/xpcshell.ini
View File

@ -52,7 +52,5 @@ tags = webextensions in-process-webextensions
skip-if = os == "android" # Bug 1350559
[test_ext_runtime_sendMessage_args.js]
[test_proxy_scripts.js]
[include:xpcshell-common.ini]
[include:xpcshell-content.ini]