Add frameId to MessageSender (extension messaging API)

extensions/renderer/resources/messaging.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // chrome.runtime.messaging API implementation.
 
   // TODO(kalman): factor requiring chrome out of here.
   var chrome = requireNative('chrome').GetChrome();
   var Event = require('event_bindings').Event;
   var lastError = require('lastError');
@@ skipping 198 matching lines @@
     logActivity.LogEvent(targetExtensionId,
                          eventName,
                          [sourceExtensionId, sourceUrl]);
     return true;
   }
 
   // Called by native code when a channel has been opened to this context.
   function dispatchOnConnect(portId,
                              channelName,
                              sourceTab,
+                             sourceFrameId,
                              sourceExtensionId,
                              targetExtensionId,
                              sourceUrl,
                              tlsChannelId) {
     // Only create a new Port if someone is actually listening for a connection.
     // In addition to being an optimization, this also fixes a bug where if 2
     // channels were opened to and from the same process, closing one would
     // close both.
     var extensionId = processNatives.GetExtensionId();
 
     // messaging_bindings.cc should ensure that this method only gets called for
     // the right extension.
     logging.CHECK(targetExtensionId == extensionId);
 
     if (ports[getOppositePortId(portId)])
       return false;  // this channel was opened by us, so ignore it
 
     // Determine whether this is coming from another extension, so we can use
     // the right event.
     var isExternal = sourceExtensionId != extensionId;
 
     var sender = {};
     if (sourceExtensionId != '')
       sender.id = sourceExtensionId;
     if (sourceUrl)
       sender.url = sourceUrl;
-    if (sourceTab)
+    if (sourceTab) {
       sender.tab = sourceTab;
+      sender.frameId = sourceFrameId;
+    }

[not at google - send to devlin, 2014/11/10 18:36:42]

Minimise the amount of logic scattered about the place which decides whether or
not to set a frame ID, i.e. just make this logic "if (sourceFrameId >= 0)
sender.frameId = sourceFrameId;"

[robwu, 2014/11/10 21:43:07]

I've done this to make sure that frameId is only set if there is a tab. We need
to either set -1 here, OR set -1 in message_service.cc. Putting this check here
makes it immediately obvious that frameId can never be set if there is no tab.
Which do you prefer?

     if (tlsChannelId !== undefined)
       sender.tlsChannelId = tlsChannelId;
 
     // Special case for sendRequest/onRequest and sendMessage/onMessage.
     if (channelName == kRequestChannel || channelName == kMessageChannel) {
       return dispatchOnRequest(portId, channelName, sender,
                                sourceExtensionId, targetExtensionId, sourceUrl,
                                isExternal);
     }
 
@@ skipping 120 matching lines @@
 exports.Port = Port;
 exports.createPort = createPort;
 exports.sendMessageImpl = sendMessageImpl;
 exports.sendMessageUpdateArguments = sendMessageUpdateArguments;
 
 // For C++ code to call.
 exports.hasPort = hasPort;
 exports.dispatchOnConnect = dispatchOnConnect;
 exports.dispatchOnDisconnect = dispatchOnDisconnect;
 exports.dispatchOnMessage = dispatchOnMessage;