Minor cleanup of StoreBuffer related heap iteration methods.

src/store-buffer.h

Index: src/store-buffer.h
diff --git a/src/store-buffer.h b/src/store-buffer.h
index acf2ab1abe8e4b9614ad11ae83ca9e48878ced6c..ede059163f5cbf0b7847804b2528a66c56f8c9b4 100644
--- a/src/store-buffer.h
+++ b/src/store-buffer.h
@@ -37,9 +37,12 @@
 namespace v8 {
 namespace internal {
 
+class StoreBuffer;
 
 typedef void (*ObjectSlotCallback)(HeapObject** from, HeapObject* to);
 
+typedef void (StoreBuffer::*RegionCallback)(
+    Address start, Address end, ObjectSlotCallback slot_callback);
 
 // Used to implement the write barrier by collecting addresses of pointers
 // between spaces.
@@ -150,6 +153,44 @@ class StoreBuffer {
   void FilterScanOnScavengeEntries();
   void ExemptPopularPages(int prime_sample_step, int threshold);
 
+  void FindPointersToNewSpaceInRegion(Address start,
+                                      Address end,
+                                      ObjectSlotCallback slot_callback);
+
+  // For each region of pointers on a page in use from an old space call
+  // visit_pointer_region callback.
+  // If either visit_pointer_region or callback can cause an allocation
+  // in old space and changes in allocation watermark then
+  // can_preallocate_during_iteration should be set to true.
+  // All pages will be marked as having invalid watermark upon

[Erik Corry, 2011/06/13 08:16:39]

Given that we don't have watermarks any more, this comment should probably just
be deleted.

+  // iteration completion.
+  void IteratePointersOnPage(
+      PagedSpace* space,
+      Page* page,
+      RegionCallback region_callback,
+      ObjectSlotCallback slot_callback);
+
+  void FindPointersToNewSpaceInMaps(
+    Address start,
+    Address end,
+    ObjectSlotCallback slot_callback);
+
+  void FindPointersToNewSpaceInMapsRegion(
+    Address start,
+    Address end,
+    ObjectSlotCallback slot_callback);
+
+  void FindPointersToNewSpaceOnPage(
+    PagedSpace* space,
+    Page* page,
+    RegionCallback region_callback,
+    ObjectSlotCallback slot_callback);
+
+#ifdef DEBUG
+  void VerifyPointers(PagedSpace* space, RegionCallback region_callback);
+  void VerifyPointers(LargeObjectSpace* space);
+#endif
+
   friend class StoreBufferRebuildScope;
   friend class DontMoveStoreBufferEntriesScope;
 };