Refactor the Heap into ThreadHeap to prepare for per thread heaps

third_party/WebKit/Source/platform/heap/HeapPage.h

 /*
  * Copyright (C) 2013 Google Inc. 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
@@ skipping 665 matching lines @@
     void completeSweep();
 
     ThreadState* threadState() { return m_threadState; }
     int heapIndex() const { return m_index; }
 
 protected:
     BasePage* m_firstPage;
     BasePage* m_firstUnsweptPage;
 
 private:
-    virtual Address lazySweepPages(size_t, size_t gcInfoIndex) = 0;
+    virtual Address lazySweepPages(size_t, size_t gcInfoIndex, GCGroup*) = 0;
 
     ThreadState* m_threadState;
 
     // Index into the page pools.  This is used to ensure that the pages of the
     // same type go into the correct page pool and thus avoid type confusion.
     int m_index;
 };
 
 class PLATFORM_EXPORT NormalPageHeap final : public BaseHeap {
 public:
@@ skipping 24 matching lines @@
     bool isObjectAllocatedAtAllocationPoint(HeapObjectHeader* header)
     {
         return header->payloadEnd() == m_currentAllocationPoint;
     }
 
 private:
     void allocatePage();
     Address outOfLineAllocate(size_t allocationSize, size_t gcInfoIndex);
     Address allocateFromFreeList(size_t, size_t gcInfoIndex);
 
-    Address lazySweepPages(size_t, size_t gcInfoIndex) override;
+    Address lazySweepPages(size_t, size_t gcInfoIndex, GCGroup*) override;
 
     Address currentAllocationPoint() const { return m_currentAllocationPoint; }
     bool hasCurrentAllocationArea() const { return currentAllocationPoint() && remainingAllocationSize(); }
     void setAllocationPoint(Address, size_t);
 
     size_t remainingAllocationSize() const { return m_remainingAllocationSize; }
     void setRemainingAllocationSize(size_t);
     void updateRemainingAllocationSize();
 
     FreeList m_freeList;
     Address m_currentAllocationPoint;
     size_t m_remainingAllocationSize;
     size_t m_lastRemainingAllocationSize;
 
     // The size of promptly freed objects in the heap.
     size_t m_promptlyFreedSize;
 };
 
 class LargeObjectHeap final : public BaseHeap {
 public:
     LargeObjectHeap(ThreadState*, int);
-    Address allocateLargeObjectPage(size_t, size_t gcInfoIndex);
+    Address allocateLargeObjectPage(size_t, size_t gcInfoIndex, GCGroup*);
     void freeLargeObjectPage(LargeObjectPage*);
 #if ENABLE(ASSERT)
     bool isConsistentForGC() override { return true; }
 #endif
 private:
-    Address doAllocateLargeObjectPage(size_t, size_t gcInfoIndex);
-    Address lazySweepPages(size_t, size_t gcInfoIndex) override;
+    Address doAllocateLargeObjectPage(size_t, size_t gcInfoIndex, GCGroup*);
+    Address lazySweepPages(size_t, size_t gcInfoIndex, GCGroup*) override;
 };
 
 // Mask an address down to the enclosing oilpan heap base page.  All oilpan heap
 // pages are aligned at blinkPageBase plus the size of a guard size.
 // FIXME: Remove PLATFORM_EXPORT once we get a proper public interface to our
 // typed heaps.  This is only exported to enable tests in HeapTest.cpp.
 PLATFORM_EXPORT inline BasePage* pageFromObject(const void* object)
 {
     Address address = reinterpret_cast<Address>(const_cast<void*>(object));
     BasePage* page = reinterpret_cast<BasePage*>(blinkPageAddress(address) + blinkGuardPageSize);
@@ skipping 103 matching lines @@
         SET_MEMORY_ACCESSIBLE(result, allocationSize - sizeof(HeapObjectHeader));
         ASSERT(findPageFromAddress(headerAddress + allocationSize - 1));
         return result;
     }
     return outOfLineAllocate(allocationSize, gcInfoIndex);
 }
 
 } // namespace blink
 
 #endif // HeapPage_h