Current HandleScope moving to Isolate.

src/api.cc

 // Copyright 2009 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 247 matching lines @@
   if (i::V8::IsRunning()) {
     return true;
   }
   if (IsDeadCheck(location)) {
     return false;
   }
   return ApiCheck(v8::V8::Initialize(), location, "Error initializing V8");
 }
 
 
-ImplementationUtilities::HandleScopeData*
-    ImplementationUtilities::CurrentHandleScope() {
-  return &i::HandleScope::current_;
-}
-
-
 #ifdef DEBUG
 void ImplementationUtilities::ZapHandleRange(i::Object** begin,
                                              i::Object** end) {
   i::HandleScope::ZapRange(begin, end);
 }
 #endif
 
 
 v8::Handle<v8::Primitive> ImplementationUtilities::Undefined() {
   if (!EnsureInitialized("v8::Undefined()")) return v8::Handle<v8::Primitive>();
@@ skipping 158 matching lines @@
   LOG_API("DisposeGlobal");
   if (!i::V8::IsRunning()) return;
   i::GlobalHandles::Destroy(obj);
 }
 
 // --- H a n d l e s ---
 
 
 HandleScope::HandleScope() : is_closed_(false) {
   API_ENTRY_CHECK("HandleScope::HandleScope");
+  // Handle scope is per-isolate so we need to initialize the current one
+  // if it wasn't already.
+  EnsureInitialized("HandleScope::HandleScope");
   i::HandleScope::Enter(&previous_);
 }
 
 
 HandleScope::~HandleScope() {
   if (!is_closed_) {
     i::HandleScope::Leave(&previous_);
   }
 }
 
@@ skipping 2584 matching lines @@
   if (!proxy.is_null())
       Utils::OpenHandle(this)->SetInternalField(index, *proxy);
 }
 
 
 // --- E n v i r o n m e n t ---
 
 bool v8::V8::Initialize() {
   if (i::V8::IsRunning()) return true;
   ENTER_V8;
-  HandleScope scope;
-  if (i::Snapshot::Initialize()) return true;
+  if(i::Snapshot::Initialize()) return true;
   return i::V8::Initialize(NULL);
 }
 
 
 bool v8::V8::Dispose() {
   i::V8::TearDown();
   return true;
 }
 
 
@@ skipping 1306 matching lines @@
 }
 
 
 char* HandleScopeImplementer::ArchiveThread(char* storage) {
   return thread_local.ArchiveThreadHelper(storage);
 }
 
 
 char* HandleScopeImplementer::ArchiveThreadHelper(char* storage) {
   v8::ImplementationUtilities::HandleScopeData* current =
-      v8::ImplementationUtilities::CurrentHandleScope();
+      Isolate::Current()->handle_scope_data();
   handle_scope_data_ = *current;
   memcpy(storage, this, sizeof(*this));
 
   ResetAfterArchive();
   current->Initialize();
 
   return storage + ArchiveSpacePerThread();
 }
 
 
 int HandleScopeImplementer::ArchiveSpacePerThread() {
   return sizeof(thread_local);
 }
 
 
 char* HandleScopeImplementer::RestoreThread(char* storage) {
   return thread_local.RestoreThreadHelper(storage);
 }
 
 
 char* HandleScopeImplementer::RestoreThreadHelper(char* storage) {
   memcpy(this, storage, sizeof(*this));
-  *v8::ImplementationUtilities::CurrentHandleScope() = handle_scope_data_;
+  *Isolate::Current()->handle_scope_data() = handle_scope_data_;
   return storage + ArchiveSpacePerThread();
 }
 
 
 void HandleScopeImplementer::IterateThis(ObjectVisitor* v) {
   // Iterate over all handles in the blocks except for the last.
   for (int i = blocks()->length() - 2; i >= 0; --i) {
     Object** block = blocks()->at(i);
     v->VisitPointers(block, &block[kHandleBlockSize]);
   }
 
   // Iterate over live handles in the last block (if any).
   if (!blocks()->is_empty()) {
     v->VisitPointers(blocks()->last(), handle_scope_data_.next);
   }
 
   if (!saved_contexts_.is_empty()) {
     Object** start = reinterpret_cast<Object**>(&saved_contexts_.first());
     v->VisitPointers(start, start + saved_contexts_.length());
   }
 }
 
 
 void HandleScopeImplementer::Iterate(ObjectVisitor* v) {
   v8::ImplementationUtilities::HandleScopeData* current =
-      v8::ImplementationUtilities::CurrentHandleScope();
+      Isolate::Current()->handle_scope_data();
   thread_local.handle_scope_data_ = *current;
   thread_local.IterateThis(v);
 }
 
 
 char* HandleScopeImplementer::Iterate(ObjectVisitor* v, char* storage) {
   HandleScopeImplementer* thread_local =
       reinterpret_cast<HandleScopeImplementer*>(storage);
   thread_local->IterateThis(v);
   return storage + ArchiveSpacePerThread();
 }
 
 } }  // namespace v8::internal