| Index: third_party/WebKit/public/platform/WebPrivateOwnPtr.h
|
| diff --git a/third_party/WebKit/public/platform/WebPrivateOwnPtr.h b/third_party/WebKit/public/platform/WebPrivateOwnPtr.h
|
| index 64d0451f9362e4a07544f0ef8c703fd63f44820f..9f29792ea15f265d2fb9afadfacdd219b2af39f6 100644
|
| --- a/third_party/WebKit/public/platform/WebPrivateOwnPtr.h
|
| +++ b/third_party/WebKit/public/platform/WebPrivateOwnPtr.h
|
| @@ -33,7 +33,8 @@
|
| #include <cstddef>
|
|
|
| #if INSIDE_BLINK
|
| -#include "wtf/PassOwnPtr.h"
|
| +#include "wtf/PtrUtil.h"
|
| +#include <memory>
|
| #endif
|
|
|
| namespace blink {
|
| @@ -60,7 +61,7 @@ public:
|
|
|
| #if INSIDE_BLINK
|
| template <typename U>
|
| - WebPrivateOwnPtr(PassOwnPtr<U>, EnsurePtrConvertibleArgDecl(U, T));
|
| + WebPrivateOwnPtr(std::unique_ptr<U>, EnsurePtrConvertibleArgDecl(U, T));
|
|
|
| void reset(T* ptr)
|
| {
|
| @@ -68,16 +69,16 @@ public:
|
| m_ptr = ptr;
|
| }
|
|
|
| - void reset(PassOwnPtr<T> o)
|
| + void reset(std::unique_ptr<T> o)
|
| {
|
| - reset(o.leakPtr());
|
| + reset(o.release());
|
| }
|
|
|
| - PassOwnPtr<T> release()
|
| + std::unique_ptr<T> release()
|
| {
|
| T* ptr = m_ptr;
|
| m_ptr = nullptr;
|
| - return adoptPtr(ptr);
|
| + return wrapUnique(ptr);
|
| }
|
|
|
| T& operator*() const
|
| @@ -100,8 +101,8 @@ private:
|
| #if INSIDE_BLINK
|
| template <typename T>
|
| template <typename U>
|
| -inline WebPrivateOwnPtr<T>::WebPrivateOwnPtr(PassOwnPtr<U> o, EnsurePtrConvertibleArgDefn(U, T))
|
| - : m_ptr(o.leakPtr())
|
| +inline WebPrivateOwnPtr<T>::WebPrivateOwnPtr(std::unique_ptr<U> o, EnsurePtrConvertibleArgDefn(U, T))
|
| + : m_ptr(o.release())
|
| {
|
| static_assert(!std::is_array<T>::value, "Pointers to array must never be converted");
|
| }
|
|
|