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

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 323 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:
   void Setup();
   void RecordJSObjectAllocation(Object* obj) {
     if (FLAG_log_producers) DoRecordJSObjectAllocation(obj);
   }
 
  private:
   ProducerHeapProfile() : can_log_(false) { }
 
   void DoRecordJSObjectAllocation(Object* obj);
   Isolate* isolate_;
   bool can_log_;
 
   friend class Isolate;
 
   DISALLOW_COPY_AND_ASSIGN(ProducerHeapProfile);
 };
 
 #endif  // ENABLE_LOGGING_AND_PROFILING
 
 } }  // namespace v8::internal
 
 #endif  // V8_HEAP_PROFILER_H_