Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: third_party/WebKit/Source/platform/heap/Heap.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/heap/Heap.h
diff --git a/third_party/WebKit/Source/platform/heap/Heap.h b/third_party/WebKit/Source/platform/heap/Heap.h
index 933037838926c0f9edaac48ea464a3892636c7b1..e6dd3ffdc86abe9cde613779482bc4b78e05aee2 100644
--- a/third_party/WebKit/Source/platform/heap/Heap.h
+++ b/third_party/WebKit/Source/platform/heap/Heap.h
@@ -42,7 +42,6 @@
#include "wtf/Assertions.h"
#include "wtf/Atomics.h"
#include "wtf/Forward.h"
-#include <memory>
namespace blink {
@@ -404,15 +403,15 @@ private:
RecursiveMutex m_threadAttachMutex;
ThreadStateSet m_threads;
ThreadHeapStats m_stats;
- std::unique_ptr<RegionTree> m_regionTree;
- std::unique_ptr<HeapDoesNotContainCache> m_heapDoesNotContainCache;
- std::unique_ptr<SafePointBarrier> m_safePointBarrier;
- std::unique_ptr<FreePagePool> m_freePagePool;
- std::unique_ptr<OrphanedPagePool> m_orphanedPagePool;
- std::unique_ptr<CallbackStack> m_markingStack;
- std::unique_ptr<CallbackStack> m_postMarkingCallbackStack;
- std::unique_ptr<CallbackStack> m_globalWeakCallbackStack;
- std::unique_ptr<CallbackStack> m_ephemeronStack;
+ OwnPtr<RegionTree> m_regionTree;
+ OwnPtr<HeapDoesNotContainCache> m_heapDoesNotContainCache;
+ OwnPtr<SafePointBarrier> m_safePointBarrier;
+ OwnPtr<FreePagePool> m_freePagePool;
+ OwnPtr<OrphanedPagePool> m_orphanedPagePool;
+ OwnPtr<CallbackStack> m_markingStack;
+ OwnPtr<CallbackStack> m_postMarkingCallbackStack;
+ OwnPtr<CallbackStack> m_globalWeakCallbackStack;
+ OwnPtr<CallbackStack> m_ephemeronStack;
BlinkGC::GCReason m_lastGCReason;
static ThreadHeap* s_mainThreadHeap;
« no previous file with comments | « third_party/WebKit/Source/platform/heap/GCTaskRunner.h ('k') | third_party/WebKit/Source/platform/heap/Heap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698