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

Unified Diff: third_party/WebKit/Source/platform/heap/ThreadState.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. 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/ThreadState.cpp
diff --git a/third_party/WebKit/Source/platform/heap/ThreadState.cpp b/third_party/WebKit/Source/platform/heap/ThreadState.cpp
index 8d0320d629868b43185b467f908cddaea4f1234b..63e607a711b71431ad4a61894538e1d15385ec92 100644
--- a/third_party/WebKit/Source/platform/heap/ThreadState.cpp
+++ b/third_party/WebKit/Source/platform/heap/ThreadState.cpp
@@ -49,8 +49,11 @@
#include "public/platform/WebTraceLocation.h"
#include "wtf/CurrentTime.h"
#include "wtf/DataLog.h"
+#include "wtf/PtrUtil.h"
#include "wtf/ThreadingPrimitives.h"
#include "wtf/allocator/Partitions.h"
+#include <memory>
+#include <v8.h>
#if OS(WIN)
#include <stddef.h>
@@ -66,8 +69,6 @@
#include <pthread_np.h>
#endif
-#include <v8.h>
-
namespace blink {
WTF::ThreadSpecific<ThreadState*>* ThreadState::s_threadSpecific = nullptr;
@@ -77,7 +78,7 @@ uint8_t ThreadState::s_mainThreadStateStorage[sizeof(ThreadState)];
ThreadState::ThreadState(bool perThreadHeapEnabled)
: m_thread(currentThread())
- , m_persistentRegion(adoptPtr(new PersistentRegion()))
+ , m_persistentRegion(wrapUnique(new PersistentRegion()))
#if OS(WIN) && COMPILER(MSVC)
, m_threadStackSize(0)
#endif
@@ -132,7 +133,7 @@ ThreadState::ThreadState(bool perThreadHeapEnabled)
m_arenas[arenaIndex] = new NormalPageArena(this, arenaIndex);
m_arenas[BlinkGC::LargeObjectArenaIndex] = new LargeObjectArena(this, BlinkGC::LargeObjectArenaIndex);
- m_likelyToBePromptlyFreed = adoptArrayPtr(new int[likelyToBePromptlyFreedArraySize]);
+ m_likelyToBePromptlyFreed = wrapArrayUnique(new int[likelyToBePromptlyFreedArraySize]);
clearArenaAges();
// There is little use of weak references and collections off the main thread;
@@ -447,7 +448,7 @@ void ThreadState::threadLocalWeakProcessing()
// Due to the complexity, we just forbid allocations.
NoAllocationScope noAllocationScope(this);
- OwnPtr<Visitor> visitor = Visitor::create(this, BlinkGC::ThreadLocalWeakProcessing);
+ std::unique_ptr<Visitor> visitor = Visitor::create(this, BlinkGC::ThreadLocalWeakProcessing);
// Perform thread-specific weak processing.
while (popAndInvokeThreadLocalWeakCallback(visitor.get())) { }
@@ -1320,7 +1321,7 @@ void ThreadState::copyStackUntilSafePointScope()
}
}
-void ThreadState::addInterruptor(PassOwnPtr<BlinkGCInterruptor> interruptor)
+void ThreadState::addInterruptor(std::unique_ptr<BlinkGCInterruptor> interruptor)
{
ASSERT(checkThread());
SafePointScope scope(BlinkGC::HeapPointersOnStack);
« no previous file with comments | « third_party/WebKit/Source/platform/heap/ThreadState.h ('k') | third_party/WebKit/Source/platform/heap/Visitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698