Remove orphaned pages from Oilpan

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 395 matching lines @@
   //
   // This is used during conservative stack scanning to
   // conservatively mark all objects that could be referenced from
   // the stack.
   virtual void checkAndMarkPointer(Visitor*, Address) = 0;
 #if DCHECK_IS_ON()
   virtual void checkAndMarkPointer(Visitor*,
                                    Address,
                                    MarkedPointerCallbackForTesting) = 0;
 #endif
-  virtual void markOrphaned();
 
   class HeapSnapshotInfo {
     STACK_ALLOCATED();
 
    public:
     size_t freeCount = 0;
     size_t freeSize = 0;
   };
 
   virtual void takeSnapshot(base::trace_event::MemoryAllocatorDump*,
                             ThreadState::GCSnapshotInfo&,
                             HeapSnapshotInfo&) = 0;
 #if DCHECK_IS_ON()
   virtual bool contains(Address) = 0;
 #endif
   virtual size_t size() = 0;
   virtual bool isLargeObjectPage() { return false; }
 
   Address getAddress() { return reinterpret_cast<Address>(this); }
   PageMemory* storage() const { return m_storage; }
   BaseArena* arena() const { return m_arena; }
-  bool orphaned() { return !m_arena; }
   bool terminating() { return m_terminating; }
   void setTerminating() { m_terminating = true; }
 
   // Returns true if this page has been swept by the ongoing lazy sweep.
   bool hasBeenSwept() const { return m_swept; }
 
   void markAsSwept() {
     ASSERT(!m_swept);
     m_swept = true;
   }
@@ skipping 42 matching lines @@
   }
 #if defined(ADDRESS_SANITIZER)
   void poisonUnmarkedObjects() override;
 #endif
   void checkAndMarkPointer(Visitor*, Address) override;
 #if DCHECK_IS_ON()
   void checkAndMarkPointer(Visitor*,
                            Address,
                            MarkedPointerCallbackForTesting) override;
 #endif
-  void markOrphaned() override;
 
   void takeSnapshot(base::trace_event::MemoryAllocatorDump*,
                     ThreadState::GCSnapshotInfo&,
                     HeapSnapshotInfo&) override;
 #if DCHECK_IS_ON()
   // Returns true for the whole blinkPageSize page that the page is on, even
   // for the header, and the unmapped guard page at the start. That ensures
   // the result can be used to populate the negative page cache.
   bool contains(Address) override;
 #endif
@@ skipping 61 matching lines @@
   void invalidateObjectStartBitmap() override {}
 #if defined(ADDRESS_SANITIZER)
   void poisonUnmarkedObjects() override;
 #endif
   void checkAndMarkPointer(Visitor*, Address) override;
 #if DCHECK_IS_ON()
   void checkAndMarkPointer(Visitor*,
                            Address,
                            MarkedPointerCallbackForTesting) override;
 #endif
-  void markOrphaned() override;
 
   void takeSnapshot(base::trace_event::MemoryAllocatorDump*,
                     ThreadState::GCSnapshotInfo&,
                     HeapSnapshotInfo&) override;
 #if DCHECK_IS_ON()
   // Returns true for any address that is on one of the pages that this
   // large object uses. That ensures that we can use a negative result to
   // populate the negative page cache.
   bool contains(Address) override;
 #endif
@@ skipping 116 matching lines @@
 // 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
 // LargeObjectPages.
 class PLATFORM_EXPORT BaseArena {
   USING_FAST_MALLOC(BaseArena);
 
  public:
   BaseArena(ThreadState*, int);
   virtual ~BaseArena();
-  void cleanupPages();
+  void removeAllPages();
 
   void takeSnapshot(const String& dumpBaseName, ThreadState::GCSnapshotInfo&);
 #if DCHECK_IS_ON()
   BasePage* findPageFromAddress(Address);
 #endif
   virtual void takeFreelistSnapshot(const String& dumpBaseName) {}
   virtual void clearFreeLists() {}
   void makeConsistentForGC();
   void makeConsistentForMutator();
 #if DCHECK_IS_ON()
@@ skipping 129 matching lines @@
   // Large objects should not refer to header->size().
   // The actual size of a large object is stored in
   // LargeObjectPage::m_payloadSize.
   ASSERT(result != largeObjectSizeInHeader);
   ASSERT(!pageFromObject(this)->isLargeObjectPage());
   return result;
 }
 
 #if DCHECK_IS_ON()
 NO_SANITIZE_ADDRESS inline bool HeapObjectHeader::checkHeader() const {
-  return !pageFromObject(this)->orphaned() && m_magic == magic;
+  return m_magic == magic;
 }
 #endif
 
 inline Address HeapObjectHeader::payload() {
   return reinterpret_cast<Address>(this) + sizeof(HeapObjectHeader);
 }
 
 inline Address HeapObjectHeader::payloadEnd() {
   return reinterpret_cast<Address>(this) + size();
 }
@@ skipping 69 matching lines @@
   return outOfLineAllocate(allocationSize, gcInfoIndex);
 }
 
 inline NormalPageArena* NormalPage::arenaForNormalPage() const {
   return static_cast<NormalPageArena*>(arena());
 }
 
 }  // namespace blink
 
 #endif  // HeapPage_h