From a27b46b817018347c07d0603e27acdca8e42555a Mon Sep 17 00:00:00 2001 From: gorhill Date: Mon, 6 Jul 2015 09:07:51 -0400 Subject: [PATCH] this fixes stalling dom inspector --- platform/chromium/vapi-background.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js index 8609a901b..9f0b03d6a 100644 --- a/platform/chromium/vapi-background.js +++ b/platform/chromium/vapi-background.js @@ -585,7 +585,7 @@ vAPI.messaging.onPortMessage = (function() { }; var toAux = function(details, portFrom) { - var portTo; + var port, portTo; var chromiumTabId = toChromiumTabId(details.toTabId); // 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 ) { continue; } - if ( messaging.ports[portName].sender.tab.id === chromiumTabId ) { - portTo = messaging.ports[portName]; + // When sending to an auxiliary process, the target is always the + // port associated with the root frame. + port = messaging.ports[portName]; + if ( port.sender.frameId === 0 && port.sender.tab.id === chromiumTabId ) { + portTo = port; break; } }