Index: third_party/WebKit/public/platform/WebPassOwnPtr.h |
diff --git a/third_party/WebKit/public/platform/WebPassOwnPtr.h b/third_party/WebKit/public/platform/WebPassOwnPtr.h |
index 217bd5404fe6e6ca6f1d9c0efefe2d58f254b097..9b2d34f5bd2c348b7202c8e23b52cd3ecfc43e56 100644 |
--- a/third_party/WebKit/public/platform/WebPassOwnPtr.h |
+++ b/third_party/WebKit/public/platform/WebPassOwnPtr.h |
@@ -10,6 +10,8 @@ |
#if INSIDE_BLINK |
#include "wtf/PassOwnPtr.h" |
+#else |
+#include <base/memory/scoped_ptr.h> |
#endif |
namespace blink { |
@@ -50,6 +52,13 @@ public: |
m_ptr = nullptr; |
return adoptPtr(ptr); |
} |
+#else |
+ operator scoped_ptr<T>() |
+ { |
+ T* ptr = m_ptr; |
+ m_ptr = nullptr; |
+ return scoped_ptr<T>(ptr); |
+ } |
#endif // INSIDE_BLINK |
template <typename U> friend class WebPassOwnPtr; |