Merge 101221 - Reland 101111 - Only deliver extension messages to contexts that care.

chrome/renderer/extensions/bindings_utils.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/singleton.h"
@@ skipping 12 matching lines @@
 namespace bindings_utils {
 
 // Contains information about a JavaScript context that is hosting extension
 // bindings.
 struct ContextInfo {
   ContextInfo(v8::Persistent<v8::Context> context,
               const std::string& extension_id,
               WebKit::WebFrame* frame);
   ~ContextInfo();
 
+  // Returns the web frame associated with this context. Can also return NULL if
+  // the context has been disassociated with the frame, and not GC'd yet.
+  WebKit::WebFrame* GetWebFrame() const;
+
+  // Returns the RenderView associated wit hthis context. Can also return NULL.
+  RenderView* GetRenderView() const;
+
   v8::Persistent<v8::Context> context;
 
   // The extension ID this context is associated with.
   std::string extension_id;
 
   // The frame the context is associated with. ContextInfo can outlive its
-  // frame, so this should not be dereferenced. It is stored only for use for
-  // comparison.
+  // frame, so this should not be dereferenced. Use GetWebFrame() instead for
+  // most cases. This is used for comparisons during unload when GetWebFrame()
+  // doesn't work.
   void* unsafe_frame;
 
   // A count of the number of events that are listening in this context. When
   // this is zero, |context| will be a weak handle.
   int num_connected_events;
 };
 typedef std::list< linked_ptr<ContextInfo> > ContextList;
 
 // Returns a mutable reference to the ContextList. Note: be careful using this.
 // Calling into javascript may result in the list being modified, so don't rely
@@ skipping 29 matching lines @@
 // be a sub-property like "Port.dispatchOnMessage". Returns the result of
 // the function call. If an exception is thrown an empty Handle will be
 // returned.
 v8::Handle<v8::Value> 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_