Chrome-side of fixes for content-script messaging.

chrome/renderer/extensions/bindings_utils.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_RENDERER_EXTENSIONS_BINDINGS_UTILS_H_
 #define CHROME_RENDERER_EXTENSIONS_BINDINGS_UTILS_H_
 
 #include "app/resource_bundle.h"
 #include "base/linked_ptr.h"
 #include "base/singleton.h"
@@ skipping 43 matching lines @@
 const char* GetStringResource() {
   return
       Singleton< StringResourceTemplate<kResourceId> >::get()->resource.c_str();
 }
 
 // Contains information about a single javascript context.
 struct ContextInfo {
   v8::Persistent<v8::Context> context;
   std::string extension_id;  // empty if the context is not an extension
 
+  // If this context is a content script, parent will be the frame that it
+  // was injected in.  This is empty if the context is not a content script.
+  v8::Persistent<v8::Context> parent_context;
+
   ContextInfo(v8::Persistent<v8::Context> context,
-              const std::string& extension_id)
-      : context(context), extension_id(extension_id) {}
+              const std::string& extension_id,
+              v8::Persistent<v8::Context> parent_context)
+      : context(context), extension_id(extension_id),
+        parent_context(parent_context) {}
 };
 typedef std::list< linked_ptr<ContextInfo> > ContextList;
 
 // Returns a mutable reference to the ContextList.
 ContextList& GetContexts();
 
 // Returns a (copied) list of contexts that have the given extension_id.
 ContextList GetContextsForExtension(const std::string& extension_id);
 
 // Returns the ContextInfo item that has the given context.
@@ skipping 20 matching lines @@
 // Call the named javascript function with the given arguments in a context.
 // The function name should be reachable from the chromeHidden object, and can
 // be a sub-property like "Port.dispatchOnMessage".
 void CallFunctionInContext(v8::Handle<v8::Context> context,
                            const std::string& function_name, int argc,
                            v8::Handle<v8::Value>* argv);
 
 }  // namespace bindings_utils
 
 #endif  // CHROME_RENDERER_EXTENSIONS_BINDINGS_UTILS_H_