[heap] Remove unused support for heap iterator size function.

src/heap/spaces.h

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_HEAP_SPACES_H_
 #define V8_HEAP_SPACES_H_
 
 #include "src/allocation.h"
 #include "src/base/atomicops.h"
 #include "src/base/bits.h"
@@ skipping 1222 matching lines @@
 //
 // A HeapObjectIterator iterates objects from the bottom of the given space
 // to its top or from the bottom of the given page to its top.
 //
 // If objects are allocated in the page during iteration the iterator may
 // or may not iterate over those objects.  The caller must create a new
 // iterator in order to be sure to visit these new objects.
 class HeapObjectIterator : public ObjectIterator {
  public:
   // Creates a new object iterator in a given space.
-  // If the size function is not given, the iterator calls the default
-  // Object::Size().
   explicit HeapObjectIterator(PagedSpace* space);
-  HeapObjectIterator(PagedSpace* space, HeapObjectCallback size_func);
-  HeapObjectIterator(Page* page, HeapObjectCallback size_func);
+  explicit HeapObjectIterator(Page* page);
 
   // Advance to the next object, skipping free spaces and other fillers and
   // skipping the special garbage section of which there is one per space.
   // Returns NULL when the iteration has ended.
   inline HeapObject* Next() {
     do {
       HeapObject* next_obj = FromCurrentPage();
       if (next_obj != NULL) return next_obj;
     } while (AdvanceToNextPage());
     return NULL;
   }
 
   virtual HeapObject* next_object() { return Next(); }
 
  private:
   enum PageMode { kOnePageOnly, kAllPagesInSpace };
 
   Address cur_addr_;              // Current iteration point.
   Address cur_end_;               // End iteration point.
-  HeapObjectCallback size_func_;  // Size function or NULL.
   PagedSpace* space_;
   PageMode page_mode_;
 
   // Fast (inlined) path of next().
   inline HeapObject* FromCurrentPage();
 
   // Slow path of next(), goes into the next page.  Returns false if the
   // iteration has ended.
   bool AdvanceToNextPage();
 
   // Initializes fields.
   inline void Initialize(PagedSpace* owner, Address start, Address end,
-                         PageMode mode, HeapObjectCallback size_func);
+                         PageMode mode);
 };
 
 
 // -----------------------------------------------------------------------------
 // A PageIterator iterates the pages in a paged space.
 
 class PageIterator BASE_EMBEDDED {
  public:
   explicit inline PageIterator(PagedSpace* space);
 
@@ skipping 981 matching lines @@
 
 
 // A SemiSpaceIterator is an ObjectIterator that iterates over the active
 // semispace of the heap's new space.  It iterates over the objects in the
 // semispace from a given start address (defaulting to the bottom of the
 // semispace) to the top of the semispace.  New objects allocated after the
 // iterator is created are not iterated.
 class SemiSpaceIterator : public ObjectIterator {
  public:
   // Create an iterator over the objects in the given space.  If no start
-  // address is given, the iterator starts from the bottom of the space.  If
-  // no size function is given, the iterator calls Object::Size().
+  // address is given, the iterator starts from the bottom of the space.
 
   // Iterate over all of allocated to-space.
   explicit SemiSpaceIterator(NewSpace* space);
-  // Iterate over all of allocated to-space, with a custome size function.
-  SemiSpaceIterator(NewSpace* space, HeapObjectCallback size_func);
   // Iterate over part of allocated to-space, from start to the end
   // of allocation.
   SemiSpaceIterator(NewSpace* space, Address start);
   // Iterate from one address to another in the same semi-space.
   SemiSpaceIterator(Address from, Address to);
 
   HeapObject* Next() {
     if (current_ == limit_) return NULL;
     if (NewSpacePage::IsAtEnd(current_)) {
       NewSpacePage* page = NewSpacePage::FromLimit(current_);
       page = page->next_page();
       DCHECK(!page->is_anchor());
       current_ = page->area_start();
       if (current_ == limit_) return NULL;
     }
 
     HeapObject* object = HeapObject::FromAddress(current_);
-    int size = (size_func_ == NULL) ? object->Size() : size_func_(object);
+    int size = object->Size();
 
     current_ += size;
     return object;
   }
 
   // Implementation of the ObjectIterator functions.
   virtual HeapObject* next_object() { return Next(); }
 
  private:
-  void Initialize(Address start, Address end, HeapObjectCallback size_func);
+  void Initialize(Address start, Address end);
 
   // The current iteration point.
   Address current_;
   // The end of iteration.
   Address limit_;
-  // The callback function.
-  HeapObjectCallback size_func_;
 };
 
 
 // -----------------------------------------------------------------------------
 // A PageIterator iterates the pages in a semi-space.
 class NewSpacePageIterator BASE_EMBEDDED {
  public:
   // Make an iterator that runs over all pages in to-space.
   explicit inline NewSpacePageIterator(NewSpace* space);
 
@@ skipping 477 matching lines @@
   // Map MemoryChunk::kAlignment-aligned chunks to large pages covering them
   HashMap chunk_map_;
 
   friend class LargeObjectIterator;
 };
 
 
 class LargeObjectIterator : public ObjectIterator {
  public:
   explicit LargeObjectIterator(LargeObjectSpace* space);
-  LargeObjectIterator(LargeObjectSpace* space, HeapObjectCallback size_func);
 
   HeapObject* Next();
 
   // implementation of ObjectIterator.
   virtual HeapObject* next_object() { return Next(); }
 
  private:
   LargePage* current_;
-  HeapObjectCallback size_func_;
 };
 
 
 // Iterates over the chunks (pages and large object pages) that can contain
 // pointers to new space.
 class PointerChunkIterator BASE_EMBEDDED {
  public:
   inline explicit PointerChunkIterator(Heap* heap);
 
   // Return NULL when the iterator is done.
@@ skipping 57 matching lines @@
     count = 0;
   }
   // Must be small, since an iteration is used for lookup.
   static const int kMaxComments = 64;
 };
 #endif
 }
 }  // namespace v8::internal
 
 #endif  // V8_HEAP_SPACES_H_