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

Unified Diff: third_party/WebKit/Source/bindings/core/v8/V8PerIsolateData.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/bindings/core/v8/V8PerIsolateData.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8PerIsolateData.cpp b/third_party/WebKit/Source/bindings/core/v8/V8PerIsolateData.cpp
index 9596c370b265ae516953d1eecae6f841aaa6ca54..baeb5c30ad90c60200dc696907d9b99f4eb32e41 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8PerIsolateData.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/V8PerIsolateData.cpp
@@ -37,6 +37,7 @@
#include "platform/ScriptForbiddenScope.h"
#include "public/platform/Platform.h"
#include "wtf/LeakAnnotations.h"
+#include "wtf/PtrUtil.h"
#include <memory>
namespace blink {
@@ -54,8 +55,8 @@ static void microtasksCompletedCallback(v8::Isolate* isolate)
}
V8PerIsolateData::V8PerIsolateData()
- : m_isolateHolder(adoptPtr(new gin::IsolateHolder()))
- , m_stringCache(adoptPtr(new StringCache(isolate())))
+ : m_isolateHolder(wrapUnique(new gin::IsolateHolder()))
+ , m_stringCache(wrapUnique(new StringCache(isolate())))
, m_hiddenValue(V8HiddenValue::create())
, m_privateProperty(V8PrivateProperty::create())
, m_constructorMode(ConstructorMode::CreateNewObject)
@@ -90,9 +91,9 @@ v8::Isolate* V8PerIsolateData::initialize()
return isolate;
}
-void V8PerIsolateData::enableIdleTasks(v8::Isolate* isolate, PassOwnPtr<gin::V8IdleTaskRunner> taskRunner)
+void V8PerIsolateData::enableIdleTasks(v8::Isolate* isolate, std::unique_ptr<gin::V8IdleTaskRunner> taskRunner)
{
- from(isolate)->m_isolateHolder->EnableIdleTasks(std::unique_ptr<gin::V8IdleTaskRunner>(taskRunner.leakPtr()));
+ from(isolate)->m_isolateHolder->EnableIdleTasks(std::unique_ptr<gin::V8IdleTaskRunner>(taskRunner.release()));
}
void V8PerIsolateData::useCounterCallback(v8::Isolate* isolate, v8::Isolate::UseCounterFeature feature)
@@ -346,14 +347,14 @@ v8::Local<v8::Object> V8PerIsolateData::findInstanceInPrototypeChain(const Wrapp
return v8::Local<v8::Object>::Cast(value)->FindInstanceInPrototypeChain(templ);
}
-void V8PerIsolateData::addEndOfScopeTask(PassOwnPtr<EndOfScopeTask> task)
+void V8PerIsolateData::addEndOfScopeTask(std::unique_ptr<EndOfScopeTask> task)
{
m_endOfScopeTasks.append(std::move(task));
}
void V8PerIsolateData::runEndOfScopeTasks()
{
- Vector<OwnPtr<EndOfScopeTask>> tasks;
+ Vector<std::unique_ptr<EndOfScopeTask>> tasks;
tasks.swap(m_endOfScopeTasks);
for (const auto& task : tasks)
task->run();
@@ -365,7 +366,7 @@ void V8PerIsolateData::clearEndOfScopeTasks()
m_endOfScopeTasks.clear();
}
-void V8PerIsolateData::setThreadDebugger(PassOwnPtr<ThreadDebugger> threadDebugger)
+void V8PerIsolateData::setThreadDebugger(std::unique_ptr<ThreadDebugger> threadDebugger)
{
ASSERT(!m_threadDebugger);
m_threadDebugger = std::move(threadDebugger);

Powered by Google App Engine
This is Rietveld 408576698