Merge r3971 and r3984 to trunk forming V8 version 2.1.2.4. This adds...

src/api.cc

Index: src/api.cc
===================================================================
--- src/api.cc	(revision 3984)
+++ src/api.cc	(working copy)
@@ -438,7 +438,7 @@
 void V8::DisposeGlobal(i::Object** obj) {
   LOG_API("DisposeGlobal");
   if (!i::V8::IsRunning()) return;
-  if ((*obj)->IsGlobalContext()) i::Heap::NotifyContextDisposed();
+  if ((*obj)->IsGlobalContext()) i::Heap::NotifyContextDisposedDeprecated();
   i::GlobalHandles::Destroy(obj);
 }
 
@@ -2821,6 +2821,12 @@
 }
 
 
+void v8::V8::ContextDisposedNotification() {
+  if (!i::V8::IsRunning()) return;
+  i::Heap::NotifyContextDisposed();
+}
+
+
 const char* v8::V8::GetVersion() {
   static v8::internal::EmbeddedVector<char, 128> buffer;
   v8::internal::Version::GetString(buffer);
@@ -2857,7 +2863,7 @@
     // decide when should make a full GC.
 #else
     // Give the heap a chance to cleanup if we've disposed contexts.
-    i::Heap::CollectAllGarbageIfContextDisposed();
+    i::Heap::CollectAllGarbageIfContextDisposedDeprecated();
 #endif
     v8::Handle<ObjectTemplate> proxy_template = global_template;
     i::Handle<i::FunctionTemplateInfo> proxy_constructor;