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

src/heap.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 616 matching lines @@
   // Performs garbage collection operation.
   // Returns whether required_space bytes are available after the collection.
   static bool CollectGarbage(int required_space, AllocationSpace space);
 
   // Performs a full garbage collection. Force compaction if the
   // parameter is true.
   static void CollectAllGarbage(bool force_compaction);
 
   // Performs a full garbage collection if a context has been disposed
   // since the last time the check was performed.
-  static void CollectAllGarbageIfContextDisposed();
+  static void CollectAllGarbageIfContextDisposedDeprecated();
 
   // Notify the heap that a context has been disposed.
   static void NotifyContextDisposed();
+  static void NotifyContextDisposedDeprecated();
 
   // Utility to invoke the scavenger. This is needed in test code to
   // ensure correct callback for weak global handles.
   static void PerformScavenge();
 
 #ifdef DEBUG
   // Utility used with flag gc-greedy.
   static bool GarbageCollectionGreedyCheck();
 #endif
 
@@ skipping 250 matching lines @@
   static int initial_semispace_size_;
   static int max_old_generation_size_;
   static size_t code_range_size_;
 
   // For keeping track of how much data has survived
   // scavenge since last new space expansion.
   static int survived_since_last_expansion_;
 
   static int always_allocate_scope_depth_;
   static int linear_allocation_scope_depth_;
-  static bool context_disposed_pending_;
+
+  // For keeping track of context disposals.
+  static int contexts_disposed_;
+  static bool context_disposed_use_deprecated_heuristic_;
+  static bool context_disposed_deprecated_pending_;
 
 #if defined(V8_TARGET_ARCH_X64)
   static const int kMaxObjectSizeInNewSpace = 512*KB;
 #else
   static const int kMaxObjectSizeInNewSpace = 256*KB;
 #endif
 
   static NewSpace new_space_;
   static OldSpace* old_pointer_space_;
   static OldSpace* old_data_space_;
@@ skipping 772 matching lines @@
 
   // To speed up scavenge collections new space string are kept
   // separate from old space strings.
   static List<Object*> new_space_strings_;
   static List<Object*> old_space_strings_;
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_HEAP_H_