Merge bleeding_edge revision 3406 and 3410 to 1.3 branch....

src/heap.h

Index: src/heap.h
===================================================================
--- src/heap.h	(revision 3407)
+++ src/heap.h	(working copy)
@@ -230,6 +230,7 @@
 
 // Forward declaration of the GCTracer class.
 class GCTracer;
+class HeapStats;
 
 
 // The all static Heap captures the interface to the global object heap.
@@ -915,6 +916,8 @@
   static RootListIndex RootIndexForExternalArrayType(
       ExternalArrayType array_type);
 
+  static void RecordStats(HeapStats* stats);
+
  private:
   static int reserved_semispace_size_;
   static int max_semispace_size_;
@@ -1147,6 +1150,29 @@
 };
 
 
+class HeapStats {
+ public:
+  int new_space_size;
+  int new_space_capacity;
+  int old_pointer_space_size;
+  int old_pointer_space_capacity;
+  int old_data_space_size;
+  int old_data_space_capacity;
+  int code_space_size;
+  int code_space_capacity;
+  int map_space_size;
+  int map_space_capacity;
+  int cell_space_size;
+  int cell_space_capacity;
+  int lo_space_size;
+  int global_handle_count;
+  int weak_global_handle_count;
+  int pending_global_handle_count;
+  int near_death_global_handle_count;
+  int destroyed_global_handle_count;
+};
+
+
 class AlwaysAllocateScope {
  public:
   AlwaysAllocateScope() {