| Index: third_party/WebKit/Source/wtf/OwnPtr.h
|
| diff --git a/third_party/WebKit/Source/wtf/OwnPtr.h b/third_party/WebKit/Source/wtf/OwnPtr.h
|
| index f8c05b619dfce591d4cfea69dd2e6fe5e9836786..a5b81b22b98f7cf3599e319ce734b9f185bca2d9 100644
|
| --- a/third_party/WebKit/Source/wtf/OwnPtr.h
|
| +++ b/third_party/WebKit/Source/wtf/OwnPtr.h
|
| @@ -59,7 +59,11 @@ public:
|
|
|
| PtrType get() const { return m_ptr; }
|
|
|
| + // Note: clear() will soon get renamed to reset() as a part of OwnPtr -> std::unique_ptr transition.
|
| + // For now, both are allowed to facilitate the rename process. See also: http://crbug.com/611661
|
| void clear();
|
| + void reset() { clear(); }
|
| +
|
| PtrType leakPtr() WARN_UNUSED_RETURN;
|
|
|
| ValueType& operator*() const { ASSERT(m_ptr); return *m_ptr; }
|
|
|