| 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 060a6217fdc24b98880347f175e70d81f3aaad0e..64d0451f9362e4a07544f0ef8c703fd63f44820f 100644
|
| --- a/third_party/WebKit/public/platform/WebPrivateOwnPtr.h
|
| +++ b/third_party/WebKit/public/platform/WebPrivateOwnPtr.h
|
| @@ -59,7 +59,8 @@ public:
|
| T* get() const { return m_ptr; }
|
|
|
| #if INSIDE_BLINK
|
| - template<typename U> WebPrivateOwnPtr(const PassOwnPtr<U>&, EnsurePtrConvertibleArgDecl(U, T));
|
| + template <typename U>
|
| + WebPrivateOwnPtr(PassOwnPtr<U>, EnsurePtrConvertibleArgDecl(U, T));
|
|
|
| void reset(T* ptr)
|
| {
|
| @@ -67,7 +68,7 @@ public:
|
| m_ptr = ptr;
|
| }
|
|
|
| - void reset(const PassOwnPtr<T>& o)
|
| + void reset(PassOwnPtr<T> o)
|
| {
|
| reset(o.leakPtr());
|
| }
|
| @@ -97,7 +98,9 @@ private:
|
| };
|
|
|
| #if INSIDE_BLINK
|
| -template<typename T> template<typename U> inline WebPrivateOwnPtr<T>::WebPrivateOwnPtr(const PassOwnPtr<U>& o, EnsurePtrConvertibleArgDefn(U, T))
|
| +template <typename T>
|
| +template <typename U>
|
| +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");
|
|
|