[Isolates] Merge 6700:7030 from bleeding_edge to isolates.

src/handles-inl.h

 // Copyright 2006-2008 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 27 matching lines @@
 namespace internal {
 
 inline Isolate* GetIsolateForHandle(Object* obj) {
   return Isolate::Current();
 }
 
 inline Isolate* GetIsolateForHandle(HeapObject* obj) {
   return obj->GetIsolate();
 }
 
-template<class T>
+template<typename T>
 Handle<T>::Handle(T* obj) {
   ASSERT(!obj->IsFailure());
   location_ = HandleScope::CreateHandle(obj, GetIsolateForHandle(obj));
 }
 
 
-template<class T>
+template<typename T>
 Handle<T>::Handle(T* obj, Isolate* isolate) {
   ASSERT(!obj->IsFailure());
   location_ = HandleScope::CreateHandle(obj, isolate);
 }
 
 
-template <class T>
+template <typename T>
 inline T* Handle<T>::operator*() const {
   ASSERT(location_ != NULL);
   ASSERT(reinterpret_cast<Address>(*location_) != kHandleZapValue);
   return *BitCast<T**>(location_);
 }
 
 
 HandleScope::HandleScope() {
   Isolate* isolate = Isolate::Current();
   v8::ImplementationUtilities::HandleScopeData* current =
@@ skipping 10 matching lines @@
   v8::ImplementationUtilities::HandleScopeData* current =
       isolate->handle_scope_data();
   isolate_ = isolate;
   prev_next_ = current->next;
   prev_limit_ = current->limit;
   current->level++;
 }
 
 
 HandleScope::~HandleScope() {
+  CloseScope();
+}
+
+void HandleScope::CloseScope() {
   ASSERT(isolate_ == Isolate::Current());
   v8::ImplementationUtilities::HandleScopeData* current =
       isolate_->handle_scope_data();
   current->next = prev_next_;
   current->level--;
   if (current->limit != prev_limit_) {
     current->limit = prev_limit_;
     DeleteExtensions(isolate_);
   }
 #ifdef DEBUG
   ZapRange(prev_next_, prev_limit_);
 #endif
 }
 
 
 template <typename T>
+Handle<T> HandleScope::CloseAndEscape(Handle<T> handle_value) {
+  T* value = *handle_value;
+  // Throw away all handles in the current scope.
+  CloseScope();
+  v8::ImplementationUtilities::HandleScopeData* current =
+      isolate_->handle_scope_data();
+  // Allocate one handle in the parent scope.
+  ASSERT(current->level > 0);
+  Handle<T> result(CreateHandle<T>(value, isolate_));
+  // Reinitialize the current scope (so that it's ready
+  // to be used or closed again).
+  prev_next_ = current->next;
+  prev_limit_ = current->limit;
+  current->level++;
+  return result;
+}
+
+
+template <typename T>
 T** HandleScope::CreateHandle(T* value, Isolate* isolate) {
   ASSERT(isolate == Isolate::Current());
   v8::ImplementationUtilities::HandleScopeData* current =
       isolate->handle_scope_data();
 
   internal::Object** cur = current->next;
   if (cur == current->limit) cur = Extend();
   // Update the current next field, set the value in the created
   // handle, and return the result.
   ASSERT(cur < current->limit);
@@ skipping 26 matching lines @@
       Isolate::Current()->handle_scope_data();
   ASSERT_EQ(0, data->level);
   data->level = level_;
 }
 #endif
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_HANDLES_INL_H_