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

chrome/renderer/extensions/object_backed_native_handler.cc

Index: chrome/renderer/extensions/object_backed_native_handler.cc
diff --git a/chrome/renderer/extensions/object_backed_native_handler.cc b/chrome/renderer/extensions/object_backed_native_handler.cc
index bb5f22be0ffbd1037eb5937473f9ebb06bb3ce85..fe5f05b4a52136a77839074f8465e1744a5c4fac 100644
--- a/chrome/renderer/extensions/object_backed_native_handler.cc
+++ b/chrome/renderer/extensions/object_backed_native_handler.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
+#include "chrome/renderer/extensions/chrome_v8_context.h"
 #include "chrome/renderer/extensions/console.h"
 #include "chrome/renderer/extensions/module_system.h"
 #include "v8/include/v8.h"
@@ -18,8 +19,8 @@ const char* kHandlerFunction = "handler_function";
 }  // namespace
 
 ObjectBackedNativeHandler::ObjectBackedNativeHandler(
-    v8::Handle<v8::Context> context)
-    : v8_context_(context),
+    ChromeV8Context* context)
+    : context_(context),
       object_template_(v8::ObjectTemplate::New()) {
 }
 
@@ -55,9 +56,10 @@ void ObjectBackedNativeHandler::RouteFunction(
     const std::string& name,
     const HandlerFunction& handler_function) {
   v8::HandleScope handle_scope;
-  v8::Context::Scope context_scope(v8_context_.get());
+  v8::Context::Scope context_scope(context_->v8_context());
 
-  v8::Persistent<v8::Object> data(v8_context_->GetIsolate(), v8::Object::New());
+  v8::Persistent<v8::Object> data(context_->v8_context()->GetIsolate(),
+                                  v8::Object::New());
   data->Set(v8::String::New(kHandlerFunction),
             v8::External::New(new HandlerFunction(handler_function)));
   router_data_.push_back(data);
@@ -66,11 +68,15 @@ void ObjectBackedNativeHandler::RouteFunction(
   object_template_->Set(name.c_str(), function_template);
 }
 
+v8::Handle<v8::Context> ObjectBackedNativeHandler::v8_context() {
+  return context_->v8_context();
+}
+
 void ObjectBackedNativeHandler::Invalidate() {
   if (!is_valid())
     return;
   v8::HandleScope handle_scope;
-  v8::Context::Scope context_scope(v8_context_.get());
+  v8::Context::Scope context_scope(context_->v8_context());
 
   for (RouterData::iterator it = router_data_.begin();
        it != router_data_.end(); ++it) {
@@ -81,11 +87,11 @@ void ObjectBackedNativeHandler::Invalidate() {
     delete static_cast<HandlerFunction*>(
         handler_function_value.As<v8::External>()->Value());
     data->Delete(v8::String::New(kHandlerFunction));
-    data.Dispose(v8_context_->GetIsolate());
+    data.Dispose(context_->v8_context()->GetIsolate());
   }
   object_template_.reset();
-  v8_context_.reset();
   NativeHandler::Invalidate();
+  context_ = NULL;

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

can this be moved back above the call to NativeHandler::Invalidate()?

[marja, 2013/05/29 16:56:33]

Done.

 }
 
 }   // extensions