Merge 6800:7180 from the bleeding edge branch to the experimental/gc branch.

src/heap-profiler.h

 // Copyright 2009-2010 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 50 matching lines @@
                                     v8::ActivityControl* control);
   static HeapSnapshot* TakeSnapshot(String* name,
                                     int type,
                                     v8::ActivityControl* control);
   static int GetSnapshotsCount();
   static HeapSnapshot* GetSnapshot(int index);
   static HeapSnapshot* FindSnapshot(unsigned uid);
 
   static void ObjectMoveEvent(Address from, Address to);
 
+  static void DefineWrapperClass(
+      uint16_t class_id, v8::HeapProfiler::WrapperInfoCallback callback);
+  static v8::RetainedObjectInfo* ExecuteWrapperClassCallback(uint16_t class_id,
+                                                             Object** wrapper);
+
   static INLINE(bool is_profiling()) {
     return singleton_ != NULL && singleton_->snapshots_->is_tracking_objects();
   }
 
   // Obsolete interface.
   // Write a single heap sample to the log file.
   static void WriteSample();
 
  private:
   HeapProfiler();
   ~HeapProfiler();
   HeapSnapshot* TakeSnapshotImpl(const char* name,
                                  int type,
                                  v8::ActivityControl* control);
   HeapSnapshot* TakeSnapshotImpl(String* name,
                                  int type,
                                  v8::ActivityControl* control);
 
   HeapSnapshotsCollection* snapshots_;
   unsigned next_snapshot_uid_;
+  List<v8::HeapProfiler::WrapperInfoCallback> wrapper_callbacks_;
 
   static HeapProfiler* singleton_;
 #endif  // ENABLE_LOGGING_AND_PROFILING
 };
 
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
 
 // JSObjectsCluster describes a group of JS objects that are
 // considered equivalent in terms of a particular profile.
@@ skipping 232 matching lines @@
   RetainerHeapProfile* js_retainer_profile() { return &js_retainer_profile_; }
 
  private:
   HistogramInfo* info_;
   ConstructorHeapProfile js_cons_profile_;
   RetainerHeapProfile js_retainer_profile_;
 };
 
 
 class HeapEntriesMap;
+class HeapEntriesAllocator;
 class HeapSnapshot;
 
 class AggregatedHeapSnapshotGenerator {
  public:
   explicit AggregatedHeapSnapshotGenerator(AggregatedHeapSnapshot* snapshot);
   void GenerateSnapshot();
   void FillHeapSnapshot(HeapSnapshot* snapshot);
 
   static const int kAllStringsType = LAST_TYPE + 1;
 
  private:
   void CalculateStringsStats();
   void CollectStats(HeapObject* obj);
   template<class Iterator>
-  void IterateRetainers(HeapEntriesMap* entries_map);
+  void IterateRetainers(
+      HeapEntriesAllocator* allocator, HeapEntriesMap* entries_map);
 
   AggregatedHeapSnapshot* agg_snapshot_;
 };
 
 
 class ProducerHeapProfile : public AllStatic {
  public:
   static void Setup();
   static void RecordJSObjectAllocation(Object* obj) {
     if (FLAG_log_producers) DoRecordJSObjectAllocation(obj);
   }
 
  private:
   static void DoRecordJSObjectAllocation(Object* obj);
   static bool can_log_;
 };
 
 #endif  // ENABLE_LOGGING_AND_PROFILING
 
 } }  // namespace v8::internal
 
 #endif  // V8_HEAP_PROFILER_H_