Add Isolate parameter to Persistent class.

samples/process.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 98 matching lines @@
                                     const AccessorInfo& info);
 
   // Callbacks that access maps
   static Handle<Value> MapGet(Local<String> name, const AccessorInfo& info);
   static Handle<Value> MapSet(Local<String> name,
                               Local<Value> value,
                               const AccessorInfo& info);
 
   // Utility methods for wrapping C++ objects as JavaScript objects,
   // and going back again.
-  static Handle<Object> WrapMap(map<string, string>* obj);
+  Handle<Object> WrapMap(map<string, string>* obj);
   static map<string, string>* UnwrapMap(Handle<Object> obj);
-  static Handle<Object> WrapRequest(HttpRequest* obj);
+  Handle<Object> WrapRequest(HttpRequest* obj);
   static HttpRequest* UnwrapRequest(Handle<Object> obj);
 
+  Isolate* GetIsolate() { return context_->GetIsolate(); }
+
   Handle<String> script_;
   Persistent<Context> context_;
   Persistent<Function> process_;
   static Persistent<ObjectTemplate> request_template_;
   static Persistent<ObjectTemplate> map_template_;
 };
 
 // -------------------------
 // --- P r o c e s s o r ---
 // -------------------------
@@ skipping 46 matching lines @@
 
   // If there is no Process function, or if it is not a function,
   // bail out
   if (!process_val->IsFunction()) return false;
 
   // It is a function; cast it to a Function
   Handle<Function> process_fun = Handle<Function>::Cast(process_val);
 
   // Store the function in a Persistent handle, since we also want
   // that to remain after this call returns
-  process_ = Persistent<Function>::New(process_fun);
+  process_ = Persistent<Function>::New(GetIsolate(), process_fun);
 
   // All done; all went well
   return true;
 }
 
 
 bool JsHttpRequestProcessor::ExecuteScript(Handle<String> script) {
   HandleScope handle_scope;
 
   // We're just about to compile the script; set up an error handler to
@@ skipping 65 matching lines @@
   } else {
     return true;
   }
 }
 
 
 JsHttpRequestProcessor::~JsHttpRequestProcessor() {
   // Dispose the persistent handles.  When noone else has any
   // references to the objects stored in the handles they will be
   // automatically reclaimed.
-  context_.Dispose();
-  process_.Dispose();
+  v8::Isolate* isolate = GetIsolate();
+  context_.Dispose(isolate);
+  process_.Dispose(isolate);
 }
 
 
 Persistent<ObjectTemplate> JsHttpRequestProcessor::request_template_;
 Persistent<ObjectTemplate> JsHttpRequestProcessor::map_template_;
 
 
 // -----------------------------------
 // --- A c c e s s i n g   M a p s ---
 // -----------------------------------
 
 // Utility function that wraps a C++ http request object in a
 // JavaScript object.
 Handle<Object> JsHttpRequestProcessor::WrapMap(map<string, string>* obj) {
   // Handle scope for temporary handles.
   HandleScope handle_scope;
 
   // Fetch the template for creating JavaScript map wrappers.
   // It only has to be created once, which we do on demand.
   if (map_template_.IsEmpty()) {
     Handle<ObjectTemplate> raw_template = MakeMapTemplate();
-    map_template_ = Persistent<ObjectTemplate>::New(raw_template);
+    map_template_ = Persistent<ObjectTemplate>::New(GetIsolate(), raw_template);
   }
   Handle<ObjectTemplate> templ = map_template_;
 
   // Create an empty map wrapper.
   Handle<Object> result = templ->NewInstance();
 
   // Wrap the raw C++ pointer in an External so it can be referenced
   // from within JavaScript.
   Handle<External> map_ptr = External::New(obj);
 
@@ skipping 84 matching lines @@
  * JavaScript object.
  */
 Handle<Object> JsHttpRequestProcessor::WrapRequest(HttpRequest* request) {
   // Handle scope for temporary handles.
   HandleScope handle_scope;
 
   // Fetch the template for creating JavaScript http request wrappers.
   // It only has to be created once, which we do on demand.
   if (request_template_.IsEmpty()) {
     Handle<ObjectTemplate> raw_template = MakeRequestTemplate();
-    request_template_ = Persistent<ObjectTemplate>::New(raw_template);
+    request_template_ =
+        Persistent<ObjectTemplate>::New(GetIsolate(), raw_template);
   }
   Handle<ObjectTemplate> templ = request_template_;
 
   // Create an empty http request wrapper.
   Handle<Object> result = templ->NewInstance();
 
   // Wrap the raw C++ pointer in an External so it can be referenced
   // from within JavaScript.
   Handle<External> request_ptr = External::New(request);
 
@@ skipping 198 matching lines @@
   JsHttpRequestProcessor processor(source);
   map<string, string> output;
   if (!processor.Initialize(&options, &output)) {
     fprintf(stderr, "Error initializing processor.\n");
     return 1;
   }
   if (!ProcessEntries(&processor, kSampleSize, kSampleRequests))
     return 1;
   PrintMap(&output);
 }