DO NOT COMMIT: Experimentation with ports

extensions/renderer/messaging_bindings.cc

 // 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.
 
 #include "extensions/renderer/messaging_bindings.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
@@ skipping 61 matching lines @@
     const std::string& channel_name,
     const ExtensionMsg_TabConnectionInfo* source,
     const ExtensionMsg_ExternalConnectionInfo& info,
     const std::string& tls_channel_id,
     bool* port_created,
     ScriptContext* script_context) {
   MessagingBindings* bindings = g_messaging_map.Get()[script_context];
   DCHECK(bindings);
 
   int opposite_port_id = global_target_port_id ^ 1;
-  if (bindings->GetPortWithGlobalId(opposite_port_id))
+  if (bindings->GetPortWithGlobalId(opposite_port_id) ||
+      bindings->DidCreatePortWithGlobalId(opposite_port_id))
     return;  // The channel was opened by this same context; ignore it.
 
   ExtensionPort* port =
       bindings->CreateNewPortWithGlobalId(global_target_port_id);
   int local_port_id = port->local_id();
   // Remove the port.
   base::ScopedClosureRunner remove_port(
       base::Bind(&MessagingBindings::RemovePortWithLocalId,
                  bindings->GetWeakPtr(), local_port_id));
 
@@ skipping 276 matching lines @@
               local_id, base::MakeUnique<ExtensionPort>(context(), local_id)))
           .first->second.get();
   port->SetGlobalId(global_id);
   return port;
 }
 
 void MessagingBindings::RemovePortWithLocalId(int local_id) {
   ports_.erase(local_id);
 }
 
+bool MessagingBindings::DidCreatePortWithGlobalId(int global_id) const {
+  return created_global_port_ids_.count(global_id) > 0;
+}
+
 base::WeakPtr<MessagingBindings> MessagingBindings::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 void MessagingBindings::PostMessage(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   // Arguments are (int32_t port_id, string message).
   CHECK(args.Length() == 2);
   CHECK(args[0]->IsInt32());
   CHECK(args[1]->IsString());
@@ skipping 83 matching lines @@
   if (!web_frame->document().isNull() &&
       (web_frame->document().unloadStartedDoNotUse() ||
        web_frame->document().processingBeforeUnloadDoNotUse())) {
     ports_created_in_before_unload_ +=
         web_frame->document().processingBeforeUnloadDoNotUse() ? 1 : 0;
     ports_created_in_unload_ +=
         web_frame->document().unloadStartedDoNotUse() ? 1 : 0;
     int global_id = frame_helper->RequestSyncPortId(info, channel_name,
                                                     include_tls_channel_id);
     ports_[local_id]->SetGlobalId(global_id);
+    created_global_port_ids_.insert(global_id);
   } else {
     ++ports_created_normal_;
     frame_helper->RequestPortId(
         info, channel_name, include_tls_channel_id,
         base::Bind(&MessagingBindings::SetGlobalPortId,
                    weak_ptr_factory_.GetWeakPtr(), local_id));
+    created_local_port_ids_.insert(local_id);
   }
 
   args.GetReturnValue().Set(static_cast<int32_t>(local_id));
 }
 
 void MessagingBindings::OpenChannelToNativeApp(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   // The Javascript code should validate/fill the arguments.
   CHECK_EQ(args.Length(), 1);
   CHECK(args[0]->IsString());
@@ skipping 46 matching lines @@
   // TODO(devlin): Why is this not part of info?
   std::string extension_id = *v8::String::Utf8Value(args[2]);
   std::string channel_name = *v8::String::Utf8Value(args[3]);
 
   ExtensionFrameHelper* frame_helper = ExtensionFrameHelper::Get(render_frame);
   DCHECK(frame_helper);
   frame_helper->RequestTabPortId(
       info, extension_id, channel_name,
       base::Bind(&MessagingBindings::SetGlobalPortId,
                  weak_ptr_factory_.GetWeakPtr(), local_id));
+  created_local_port_ids_.insert(local_id);
 
   args.GetReturnValue().Set(static_cast<int32_t>(local_id));
 }
 
 void MessagingBindings::ClosePort(int local_port_id, bool force_close) {
   // TODO(robwu): Merge this logic with CloseChannel once the TODO in BindToGC
   // has been addressed.
   auto iter = ports_.find(local_port_id);
   if (iter != ports_.end()) {
     std::unique_ptr<ExtensionPort> port = std::move(iter->second);
     ports_.erase(iter);
     port->Close(force_close);
     // If the port hasn't been initialized, we can't delete it just yet, because
     // we need to wait for it to send any pending messages. This is important
     // to support the flow:
     //  var port = chrome.runtime.connect();
     //  port.postMessage({message});
     //  port.disconnect();
     if (!port->initialized())
       disconnected_ports_[port->local_id()] = std::move(port);
   }
 }
 
 void MessagingBindings::SetGlobalPortId(int local_id, int global_id) {
+  if (created_local_port_ids_.erase(local_id))
+    created_global_port_ids_.insert(global_id);
+
   auto iter = ports_.find(local_id);
   if (iter != ports_.end()) {
     iter->second->SetGlobalId(global_id);
     return;
   }
 
   iter = disconnected_ports_.find(local_id);
   DCHECK(iter != disconnected_ports_.end());
   iter->second->SetGlobalId(global_id);
   // Setting the global id dispatches pending messages, so we can delete the
   // port now.
   disconnected_ports_.erase(iter);
 }
 
 int MessagingBindings::GetNextLocalId() { return next_local_id_++; }
 
 }  // namespace extensions