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

chrome/renderer/extensions/object_backed_native_handler.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/object_backed_native_handler.h"
 
 #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"
 
 namespace extensions {
 
 namespace {
 // Key for the base::Bound routed function.
 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()) {
 }
 
 ObjectBackedNativeHandler::~ObjectBackedNativeHandler() {
   Invalidate();
 }
 
 v8::Handle<v8::Object> ObjectBackedNativeHandler::NewInstance() {
   return object_template_->NewInstance();
 }
@@ skipping 15 matching lines @@
   }
   DCHECK(handler_function_value->IsExternal());
   return handle_scope.Close(static_cast<HandlerFunction*>(
       handler_function_value.As<v8::External>()->Value())->Run(args));
 }
 
 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);
   v8::Handle<v8::FunctionTemplate> function_template =
       v8::FunctionTemplate::New(Router, data);
   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) {
     v8::Persistent<v8::Object> data = *it;
     v8::Handle<v8::Value> handler_function_value =
         data->Get(v8::String::New(kHandlerFunction));
     CHECK(!handler_function_value.IsEmpty());
     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