Extensions: pass ChromeV8Context around instead of v8::Handle.

chrome/renderer/extensions/event_bindings.cc

 // Copyright (c) 2012 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 "chrome/renderer/extensions/event_bindings.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/basictypes.h"
@@ skipping 52 matching lines @@
 
 // A map of extension IDs to filtered listener counts for that extension.
 base::LazyInstance<std::map<std::string, FilteredEventListenerCounts> >
     g_filtered_listener_counts = LAZY_INSTANCE_INITIALIZER;
 
 base::LazyInstance<EventFilter> g_event_filter = LAZY_INSTANCE_INITIALIZER;
 
 // TODO(koz): Merge this into EventBindings.
 class ExtensionImpl : public ChromeV8Extension {
  public:
-  explicit ExtensionImpl(Dispatcher* dispatcher,
-                         v8::Handle<v8::Context> v8_context)
-      : ChromeV8Extension(dispatcher, v8_context) {
+  explicit ExtensionImpl(Dispatcher* dispatcher, ChromeV8Context* context)
+      : ChromeV8Extension(dispatcher, context) {
     RouteFunction("AttachEvent",
         base::Bind(&ExtensionImpl::AttachEvent, base::Unretained(this)));
     RouteFunction("DetachEvent",
         base::Bind(&ExtensionImpl::DetachEvent, base::Unretained(this)));
     RouteFunction("AttachFilteredEvent",
         base::Bind(&ExtensionImpl::AttachFilteredEvent,
                    base::Unretained(this)));
     RouteFunction("DetachFilteredEvent",
         base::Bind(&ExtensionImpl::DetachFilteredEvent,
                    base::Unretained(this)));
     RouteFunction("MatchAgainstEventFilter",
         base::Bind(&ExtensionImpl::MatchAgainstEventFilter,
                    base::Unretained(this)));
   }
 
   virtual ~ExtensionImpl() {}
 
   // Attach an event name to an object.
   v8::Handle<v8::Value> AttachEvent(const v8::Arguments& args) {
     DCHECK(args.Length() == 1);
     // TODO(erikkay) should enforce that event name is a string in the bindings
     DCHECK(args[0]->IsString() || args[0]->IsUndefined());
 
     if (args[0]->IsString()) {
       std::string event_name = *v8::String::AsciiValue(args[0]->ToString());
-      const ChromeV8ContextSet& context_set = dispatcher_->v8_context_set();
-      ChromeV8Context* context = context_set.GetByV8Context(v8_context());
+      ChromeV8Context* context = GetContext();

[not at google - send to devlin, 2013/05/29 17:41:55]

ditto etc

[marja, 2013/05/31 10:06:44]

Done.

       CHECK(context);
 
       if (!dispatcher_->CheckContextAccessToExtensionAPI(event_name, context))
         return v8::Undefined();
 
       std::string extension_id = context->GetExtensionID();
       EventListenerCounts& listener_counts =
           g_listener_counts.Get()[extension_id];
       if (++listener_counts[event_name] == 1) {
         content::RenderThread::Get()->Send(
@@ skipping 13 matching lines @@
 
   v8::Handle<v8::Value> DetachEvent(const v8::Arguments& args) {
     DCHECK(args.Length() == 2);
     // TODO(erikkay) should enforce that event name is a string in the bindings
     DCHECK(args[0]->IsString() || args[0]->IsUndefined());
 
     if (args[0]->IsString() && args[1]->IsBoolean()) {
       std::string event_name = *v8::String::AsciiValue(args[0]->ToString());
       bool is_manual = args[1]->BooleanValue();
 
-      const ChromeV8ContextSet& context_set = dispatcher_->v8_context_set();
-      ChromeV8Context* context = context_set.GetByV8Context(v8_context());
+      ChromeV8Context* context = GetContext();
       if (!context)
         return v8::Undefined();
 
       std::string extension_id = context->GetExtensionID();
       EventListenerCounts& listener_counts =
           g_listener_counts.Get()[extension_id];
 
       if (--listener_counts[event_name] == 0) {
         content::RenderThread::Get()->Send(
             new ExtensionHostMsg_RemoveListener(extension_id, event_name));
@@ skipping 15 matching lines @@
   // MatcherID AttachFilteredEvent(string event_name, object filter)
   // event_name - Name of the event to attach.
   // filter - Which instances of the named event are we interested in.
   // returns the id assigned to the listener, which will be returned from calls
   // to MatchAgainstEventFilter where this listener matches.
   v8::Handle<v8::Value> AttachFilteredEvent(const v8::Arguments& args) {
     DCHECK_EQ(2, args.Length());
     DCHECK(args[0]->IsString());
     DCHECK(args[1]->IsObject());
 
-    const ChromeV8ContextSet& context_set = dispatcher_->v8_context_set();
-    ChromeV8Context* context = context_set.GetByV8Context(v8_context());
+    ChromeV8Context* context = GetContext();
     DCHECK(context);
     if (!context)
       return v8::Integer::New(-1);
 
     std::string event_name = *v8::String::AsciiValue(args[0]);
     // This method throws an exception if it returns false.
     if (!dispatcher_->CheckContextAccessToExtensionAPI(event_name, context))
       return v8::Undefined();
 
     std::string extension_id = context->GetExtensionID();
@@ skipping 60 matching lines @@
 
   // void DetachFilteredEvent(int id, bool manual)
   // id     - Id of the event to detach.
   // manual - false if this is part of the extension unload process where all
   //          listeners are automatically detached.
   v8::Handle<v8::Value> DetachFilteredEvent(const v8::Arguments& args) {
     DCHECK_EQ(2, args.Length());
     DCHECK(args[0]->IsInt32());
     DCHECK(args[1]->IsBoolean());
     bool is_manual = args[1]->BooleanValue();
-    const ChromeV8ContextSet& context_set = dispatcher_->v8_context_set();
-    ChromeV8Context* context = context_set.GetByV8Context(v8_context());
+    ChromeV8Context* context = GetContext();
     if (!context)
       return v8::Undefined();
 
     std::string extension_id = context->GetExtensionID();
     if (extension_id.empty())
       return v8::Undefined();
 
     int matcher_id = args[0]->Int32Value();
     EventFilter& event_filter = g_event_filter.Get();
     EventMatcher* event_matcher =
@@ skipping 57 matching lines @@
       base::DictionaryValue* filter_dict) {
     return scoped_ptr<EventMatcher>(new EventMatcher(
         scoped_ptr<base::DictionaryValue>(filter_dict->DeepCopy())));
   }
 };
 
 }  // namespace
 
 // static
 ChromeV8Extension* EventBindings::Create(Dispatcher* dispatcher,
-                                         v8::Handle<v8::Context> context) {
+                                         ChromeV8Context* context) {
   return new ExtensionImpl(dispatcher, context);
 }
 
 }  // namespace extensions