Index: third_party/WebKit/Source/bindings/core/v8/V8PerContextData.h |
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8PerContextData.h b/third_party/WebKit/Source/bindings/core/v8/V8PerContextData.h |
index 7352b64d4e5e6d3af0de8b7c7bb500fb8a722431..0b9731875776ed64762420bf69ea28e3412aec3f 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/V8PerContextData.h |
+++ b/third_party/WebKit/Source/bindings/core/v8/V8PerContextData.h |
@@ -40,10 +40,10 @@ |
#include "gin/public/gin_embedders.h" |
#include "wtf/Allocator.h" |
#include "wtf/HashMap.h" |
+#include "wtf/PassOwnPtr.h" |
#include "wtf/Vector.h" |
#include "wtf/text/AtomicString.h" |
#include "wtf/text/AtomicStringHash.h" |
-#include <memory> |
#include <v8.h> |
namespace blink { |
@@ -59,7 +59,7 @@ class CORE_EXPORT V8PerContextData final { |
USING_FAST_MALLOC(V8PerContextData); |
WTF_MAKE_NONCOPYABLE(V8PerContextData); |
public: |
- static std::unique_ptr<V8PerContextData> create(v8::Local<v8::Context>); |
+ static PassOwnPtr<V8PerContextData> create(v8::Local<v8::Context>); |
static V8PerContextData* from(v8::Local<v8::Context>); |
@@ -84,7 +84,7 @@ public: |
v8::Local<v8::Object> prototypeForType(const WrapperTypeInfo*); |
- void addCustomElementBinding(std::unique_ptr<V0CustomElementBinding>); |
+ void addCustomElementBinding(PassOwnPtr<V0CustomElementBinding>); |
V8DOMActivityLogger* activityLogger() const { return m_activityLogger; } |
void setActivityLogger(V8DOMActivityLogger* activityLogger) { m_activityLogger = activityLogger; } |
@@ -108,12 +108,12 @@ private: |
typedef V8GlobalValueMap<const WrapperTypeInfo*, v8::Function, v8::kNotWeak> ConstructorMap; |
ConstructorMap m_constructorMap; |
- std::unique_ptr<gin::ContextHolder> m_contextHolder; |
+ OwnPtr<gin::ContextHolder> m_contextHolder; |
ScopedPersistent<v8::Context> m_context; |
ScopedPersistent<v8::Value> m_errorPrototype; |
- typedef Vector<std::unique_ptr<V0CustomElementBinding>> V0CustomElementBindingList; |
+ typedef Vector<OwnPtr<V0CustomElementBinding>> V0CustomElementBindingList; |
V0CustomElementBindingList m_customElementBindings; |
// This is owned by a static hash map in V8DOMActivityLogger. |