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