| Index: third_party/WebKit/Source/platform/heap/HeapPage.h
|
| diff --git a/third_party/WebKit/Source/platform/heap/HeapPage.h b/third_party/WebKit/Source/platform/heap/HeapPage.h
|
| index 233d8de17c9cb4174737b57a8ccbdaa53ae04d81..344748f74356fd83bedd35104f48e3220cb120cf 100644
|
| --- a/third_party/WebKit/Source/platform/heap/HeapPage.h
|
| +++ b/third_party/WebKit/Source/platform/heap/HeapPage.h
|
| @@ -420,7 +420,6 @@ class BasePage {
|
| Address,
|
| MarkedPointerCallbackForTesting) = 0;
|
| #endif
|
| - virtual void markOrphaned();
|
|
|
| class HeapSnapshotInfo {
|
| STACK_ALLOCATED();
|
| @@ -442,7 +441,6 @@ class BasePage {
|
| 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; }
|
|
|
| @@ -506,7 +504,6 @@ class NormalPage final : public BasePage {
|
| Address,
|
| MarkedPointerCallbackForTesting) override;
|
| #endif
|
| - void markOrphaned() override;
|
|
|
| void takeSnapshot(base::trace_event::MemoryAllocatorDump*,
|
| ThreadState::GCSnapshotInfo&,
|
| @@ -589,7 +586,6 @@ class LargeObjectPage final : public BasePage {
|
| Address,
|
| MarkedPointerCallbackForTesting) override;
|
| #endif
|
| - void markOrphaned() override;
|
|
|
| void takeSnapshot(base::trace_event::MemoryAllocatorDump*,
|
| ThreadState::GCSnapshotInfo&,
|
| @@ -726,7 +722,7 @@ class PLATFORM_EXPORT BaseArena {
|
| public:
|
| BaseArena(ThreadState*, int);
|
| virtual ~BaseArena();
|
| - void cleanupPages();
|
| + void removeAllPages();
|
|
|
| void takeSnapshot(const String& dumpBaseName, ThreadState::GCSnapshotInfo&);
|
| #if DCHECK_IS_ON()
|
| @@ -876,7 +872,7 @@ NO_SANITIZE_ADDRESS inline size_t HeapObjectHeader::size() const {
|
|
|
| #if DCHECK_IS_ON()
|
| NO_SANITIZE_ADDRESS inline bool HeapObjectHeader::checkHeader() const {
|
| - return !pageFromObject(this)->orphaned() && m_magic == magic;
|
| + return m_magic == magic;
|
| }
|
| #endif
|
|
|
|
|