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

src/runtime-profiler.h

Index: src/runtime-profiler.h
===================================================================
--- src/runtime-profiler.h	(revision 7006)
+++ src/runtime-profiler.h	(working copy)
@@ -62,7 +62,6 @@
   void Reset();
   void TearDown();
 
-  void MarkCompactPrologue(bool is_compacting);
   Object** SamplerWindowAddress();
   int SamplerWindowSize();
 
@@ -94,6 +93,10 @@
   // wake it up first.
   static void WakeUpRuntimeProfilerThreadBeforeShutdown();
 
+  void UpdateSamplesAfterScavenge();
+  void RemoveDeadSamples();
+  void UpdateSamplesAfterCompact(ObjectVisitor* visitor);
+
  private:
   static const int kSamplerWindowSize = 16;
   static const int kStateWindowSize = 128;
@@ -125,11 +128,6 @@
   // The ratio of ticks spent in JS code in percent.
   Atomic32 js_ratio_;
 
-  // The JSFunctions in the sampler window are not GC safe. Old-space
-  // pointers are not cleared during mark-sweep collection and therefore
-  // the window might contain stale pointers. The window is updated on
-  // scavenges and (parts of it) cleared on mark-sweep and
-  // mark-sweep-compact.
   Object* sampler_window_[kSamplerWindowSize];
   int sampler_window_position_;
   int sampler_window_weight_[kSamplerWindowSize];