Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-15 07:22:28 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:gorhill/uBlock into shadow

Browse Source
This commit is contained in:
gorhill 2015-07-06 09:08:07 -04:00
commit 96a254091b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
platform/chromium/vapi-background.js
View File

@ -585,7 +585,7 @@ vAPI.messaging.onPortMessage = (function() {
}; };
var toAux = function(details, portFrom) { var toAux = function(details, portFrom) {
var portTo; var port, portTo;
var chromiumTabId = toChromiumTabId(details.toTabId); var chromiumTabId = toChromiumTabId(details.toTabId);
// TODO: This could be an issue with a lot of tabs: easy to address // TODO: This could be an issue with a lot of tabs: easy to address
@ -594,8 +594,11 @@ vAPI.messaging.onPortMessage = (function() {
if ( messaging.ports.hasOwnProperty(portName) === false ) { if ( messaging.ports.hasOwnProperty(portName) === false ) {
continue; continue;
} }
if ( messaging.ports[portName].sender.tab.id === chromiumTabId ) { // When sending to an auxiliary process, the target is always the
portTo = messaging.ports[portName]; // port associated with the root frame.
port = messaging.ports[portName];
if ( port.sender.frameId === 0 && port.sender.tab.id === chromiumTabId ) {
portTo = port;
break; break;
} }
} }