Revert of Simple BlinkGC heap compaction.

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 494 matching lines @@
     // Compute the amount of padding we have to add to a header to make
     // the size of the header plus the padding a multiple of 8 bytes.
     size_t paddingSize = (sizeof(NormalPage) + allocationGranularity -
                           (sizeof(HeapObjectHeader) % allocationGranularity)) %
                          allocationGranularity;
     return sizeof(NormalPage) + paddingSize;
   }
 
   inline NormalPageArena* arenaForNormalPage() const;
 
-  // Context object holding the state of the arena page compaction pass,
-  // passed in when compacting individual pages.
-  class CompactionContext {
-    STACK_ALLOCATED();
-
-   public:
-    // Page compacting into.
-    NormalPage* m_currentPage = nullptr;
-    // Offset into |m_currentPage| to the next free address.
-    size_t m_allocationPoint = 0;
-    // Chain of available pages to use for compaction. Page compaction
-    // picks the next one when the current one is exhausted.
-    BasePage* m_availablePages = nullptr;
-    // Chain of pages that have been compacted. Page compaction will
-    // add compacted pages once the current one becomes exhausted.
-    BasePage** m_compactedPages = nullptr;
-  };
-
-  void sweepAndCompact(CompactionContext&);
-
  private:
   HeapObjectHeader* findHeaderFromAddress(Address);
   void populateObjectStartBitMap();
 
   bool m_objectStartBitMapComputed;
   uint8_t m_objectStartBitMap[reservedForObjectBitMap];
 };
 
 // Large allocations are allocated as separate objects and linked in a list.
 //
@@ skipping 133 matching lines @@
   static void zapFreedMemory(Address, size_t);
   static void checkFreedMemoryIsZapped(Address, size_t);
 #endif
 
  private:
   int m_biggestFreeListIndex;
 
   // All FreeListEntries in the nth list have size >= 2^n.
   FreeListEntry* m_freeLists[blinkPageSizeLog2];
 
-  size_t freeListSize() const;
-
   friend class NormalPageArena;
 };
 
 // Each thread has a number of thread arenas (e.g., Generic arenas,
 // typed arenas for Node, arenas for collection backings etc)
 // and BaseArena represents each thread arena.
 //
 // BaseArena is a parent class of NormalPageArena and LargeObjectArena.
 // NormalPageArena represents a part of a heap that contains NormalPages
 // and LargeObjectArena represents a part of a heap that contains
@@ skipping 76 matching lines @@
   bool shrinkObject(HeapObjectHeader*, size_t);
   void decreasePromptlyFreedSize(size_t size) { m_promptlyFreedSize -= size; }
 
   bool isObjectAllocatedAtAllocationPoint(HeapObjectHeader* header) {
     return header->payloadEnd() == m_currentAllocationPoint;
   }
 
   bool isLazySweeping() const { return m_isLazySweeping; }
   void setIsLazySweeping(bool flag) { m_isLazySweeping = flag; }
 
-  size_t arenaSize();
-  size_t freeListSize();
-
-  void sweepAndCompact();
-
  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 currentAllocationPoint() const { return m_currentAllocationPoint; }
   bool hasCurrentAllocationArea() const {
     return currentAllocationPoint() && remainingAllocationSize();
   }
   void setAllocationPoint(Address, size_t);
@@ skipping 144 matching lines @@
   return outOfLineAllocate(allocationSize, gcInfoIndex);
 }
 
 inline NormalPageArena* NormalPage::arenaForNormalPage() const {
   return static_cast<NormalPageArena*>(arena());
 }
 
 }  // namespace blink
 
 #endif  // HeapPage_h