Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1029)

Unified Diff: third_party/WebKit/Source/wtf/OwnPtr.h

Issue 1611343002: wtf reformat test Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pydent Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/wtf/OptionalTest.cpp ('k') | third_party/WebKit/Source/wtf/OwnPtrCommon.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0b0b58e081883b6b114a5ab04d6c8a17cf6d1f28..f3e259bf3cb9f27c3b31bd99e3215ff87664c67f 100644
--- a/third_party/WebKit/Source/wtf/OwnPtr.h
+++ b/third_party/WebKit/Source/wtf/OwnPtr.h
@@ -31,220 +31,239 @@
namespace WTF {
-template <typename T> class PassOwnPtr;
-
-template <typename T> class OwnPtr {
- USING_FAST_MALLOC(OwnPtr);
- WTF_MAKE_NONCOPYABLE(OwnPtr);
-public:
- typedef typename std::remove_extent<T>::type ValueType;
- typedef ValueType* PtrType;
-
- OwnPtr() : m_ptr(nullptr) {}
- OwnPtr(std::nullptr_t) : m_ptr(nullptr) {}
-
- // See comment in PassOwnPtr.h for why this takes a const reference.
- OwnPtr(const PassOwnPtr<T>&);
- template <typename U> OwnPtr(const PassOwnPtr<U>&, EnsurePtrConvertibleArgDecl(U, T));
-
- // Hash table deleted values, which are only constructed and never copied or
- // destroyed.
- OwnPtr(HashTableDeletedValueType) : m_ptr(hashTableDeletedValue()) {}
- bool isHashTableDeletedValue() const { return m_ptr == hashTableDeletedValue(); }
-
- ~OwnPtr()
- {
- OwnedPtrDeleter<T>::deletePtr(m_ptr);
- m_ptr = nullptr;
- }
-
- PtrType get() const { return m_ptr; }
-
- void clear();
- PassOwnPtr<T> release();
- PtrType leakPtr() WARN_UNUSED_RETURN;
-
- ValueType& operator*() const { ASSERT(m_ptr); return *m_ptr; }
- PtrType operator->() const { ASSERT(m_ptr); return m_ptr; }
-
- ValueType& operator[](std::ptrdiff_t i) const;
-
- bool operator!() const { return !m_ptr; }
-
- // This conversion operator allows implicit conversion to bool but not to
- // other integer types.
- typedef PtrType OwnPtr::*UnspecifiedBoolType;
- operator UnspecifiedBoolType() const { return m_ptr ? &OwnPtr::m_ptr : 0; }
-
- OwnPtr& operator=(const PassOwnPtr<T>&);
- OwnPtr& operator=(std::nullptr_t) { clear(); return *this; }
- template <typename U> OwnPtr& operator=(const PassOwnPtr<U>&);
-
- OwnPtr(OwnPtr&&);
- template <typename U> OwnPtr(OwnPtr<U>&&);
-
- OwnPtr& operator=(OwnPtr&&);
- template <typename U> OwnPtr& operator=(OwnPtr<U>&&);
-
- void swap(OwnPtr& o) { std::swap(m_ptr, o.m_ptr); }
-
- static T* hashTableDeletedValue() { return reinterpret_cast<T*>(-1); }
-
-private:
- // We should never have two OwnPtrs for the same underlying object
- // (otherwise we'll get double-destruction), so these equality operators
- // should never be needed.
- template <typename U> bool operator==(const OwnPtr<U>&) const
- {
- static_assert(!sizeof(U*), "OwnPtrs should never be equal");
- return false;
- }
- template <typename U> bool operator!=(const OwnPtr<U>&) const
- {
- static_assert(!sizeof(U*), "OwnPtrs should never be equal");
- return false;
- }
- template <typename U> bool operator==(const PassOwnPtr<U>&) const
- {
- static_assert(!sizeof(U*), "OwnPtrs should never be equal");
- return false;
- }
- template <typename U> bool operator!=(const PassOwnPtr<U>&) const
- {
- static_assert(!sizeof(U*), "OwnPtrs should never be equal");
- return false;
- }
-
- PtrType m_ptr;
+template <typename T>
+class PassOwnPtr;
+
+template <typename T>
+class OwnPtr {
+ USING_FAST_MALLOC(OwnPtr);
+ WTF_MAKE_NONCOPYABLE(OwnPtr);
+
+ public:
+ typedef typename std::remove_extent<T>::type ValueType;
+ typedef ValueType* PtrType;
+
+ OwnPtr() : m_ptr(nullptr) {}
+ OwnPtr(std::nullptr_t) : m_ptr(nullptr) {}
+
+ // See comment in PassOwnPtr.h for why this takes a const reference.
+ OwnPtr(const PassOwnPtr<T>&);
+ template <typename U>
+ OwnPtr(const PassOwnPtr<U>&, EnsurePtrConvertibleArgDecl(U, T));
+
+ // Hash table deleted values, which are only constructed and never copied or
+ // destroyed.
+ OwnPtr(HashTableDeletedValueType) : m_ptr(hashTableDeletedValue()) {}
+ bool isHashTableDeletedValue() const {
+ return m_ptr == hashTableDeletedValue();
+ }
+
+ ~OwnPtr() {
+ OwnedPtrDeleter<T>::deletePtr(m_ptr);
+ m_ptr = nullptr;
+ }
+
+ PtrType get() const { return m_ptr; }
+
+ void clear();
+ PassOwnPtr<T> release();
+ PtrType leakPtr() WARN_UNUSED_RETURN;
+
+ ValueType& operator*() const {
+ ASSERT(m_ptr);
+ return *m_ptr;
+ }
+ PtrType operator->() const {
+ ASSERT(m_ptr);
+ return m_ptr;
+ }
+
+ ValueType& operator[](std::ptrdiff_t i) const;
+
+ bool operator!() const { return !m_ptr; }
+
+ // This conversion operator allows implicit conversion to bool but not to
+ // other integer types.
+ typedef PtrType OwnPtr::*UnspecifiedBoolType;
+ operator UnspecifiedBoolType() const { return m_ptr ? &OwnPtr::m_ptr : 0; }
+
+ OwnPtr& operator=(const PassOwnPtr<T>&);
+ OwnPtr& operator=(std::nullptr_t) {
+ clear();
+ return *this;
+ }
+ template <typename U>
+ OwnPtr& operator=(const PassOwnPtr<U>&);
+
+ OwnPtr(OwnPtr&&);
+ template <typename U>
+ OwnPtr(OwnPtr<U>&&);
+
+ OwnPtr& operator=(OwnPtr&&);
+ template <typename U>
+ OwnPtr& operator=(OwnPtr<U>&&);
+
+ void swap(OwnPtr& o) { std::swap(m_ptr, o.m_ptr); }
+
+ static T* hashTableDeletedValue() { return reinterpret_cast<T*>(-1); }
+
+ private:
+ // We should never have two OwnPtrs for the same underlying object
+ // (otherwise we'll get double-destruction), so these equality operators
+ // should never be needed.
+ template <typename U>
+ bool operator==(const OwnPtr<U>&) const {
+ static_assert(!sizeof(U*), "OwnPtrs should never be equal");
+ return false;
+ }
+ template <typename U>
+ bool operator!=(const OwnPtr<U>&) const {
+ static_assert(!sizeof(U*), "OwnPtrs should never be equal");
+ return false;
+ }
+ template <typename U>
+ bool operator==(const PassOwnPtr<U>&) const {
+ static_assert(!sizeof(U*), "OwnPtrs should never be equal");
+ return false;
+ }
+ template <typename U>
+ bool operator!=(const PassOwnPtr<U>&) const {
+ static_assert(!sizeof(U*), "OwnPtrs should never be equal");
+ return false;
+ }
+
+ PtrType m_ptr;
};
-template <typename T> inline OwnPtr<T>::OwnPtr(const PassOwnPtr<T>& o)
- : m_ptr(o.leakPtr())
-{
-}
+template <typename T>
+inline OwnPtr<T>::OwnPtr(const PassOwnPtr<T>& o) : m_ptr(o.leakPtr()) {}
template <typename T>
-template <typename U> inline OwnPtr<T>::OwnPtr(const PassOwnPtr<U>& o, EnsurePtrConvertibleArgDefn(U, T))
- : m_ptr(o.leakPtr())
-{
- static_assert(!std::is_array<T>::value, "pointers to array must never be converted");
+template <typename U>
+inline OwnPtr<T>::OwnPtr(const PassOwnPtr<U>& o,
+ EnsurePtrConvertibleArgDefn(U, T))
+ : m_ptr(o.leakPtr()) {
+ static_assert(!std::is_array<T>::value,
+ "pointers to array must never be converted");
}
-template <typename T> inline void OwnPtr<T>::clear()
-{
- PtrType ptr = m_ptr;
- m_ptr = nullptr;
- OwnedPtrDeleter<T>::deletePtr(ptr);
+template <typename T>
+inline void OwnPtr<T>::clear() {
+ PtrType ptr = m_ptr;
+ m_ptr = nullptr;
+ OwnedPtrDeleter<T>::deletePtr(ptr);
}
-template <typename T> inline PassOwnPtr<T> OwnPtr<T>::release()
-{
- PtrType ptr = m_ptr;
- m_ptr = nullptr;
- return PassOwnPtr<T>(ptr);
+template <typename T>
+inline PassOwnPtr<T> OwnPtr<T>::release() {
+ PtrType ptr = m_ptr;
+ m_ptr = nullptr;
+ return PassOwnPtr<T>(ptr);
}
-template <typename T> inline typename OwnPtr<T>::PtrType OwnPtr<T>::leakPtr()
-{
- PtrType ptr = m_ptr;
- m_ptr = nullptr;
- return ptr;
+template <typename T>
+inline typename OwnPtr<T>::PtrType OwnPtr<T>::leakPtr() {
+ PtrType ptr = m_ptr;
+ m_ptr = nullptr;
+ return ptr;
}
-template <typename T> inline typename OwnPtr<T>::ValueType& OwnPtr<T>::operator[](std::ptrdiff_t i) const
-{
- static_assert(std::is_array<T>::value, "elements access is possible for arrays only");
- ASSERT(m_ptr);
- ASSERT(i >= 0);
- return m_ptr[i];
+template <typename T>
+inline typename OwnPtr<T>::ValueType& OwnPtr<T>::operator[](
+ std::ptrdiff_t i) const {
+ static_assert(std::is_array<T>::value,
+ "elements access is possible for arrays only");
+ ASSERT(m_ptr);
+ ASSERT(i >= 0);
+ return m_ptr[i];
}
-template <typename T> inline OwnPtr<T>& OwnPtr<T>::operator=(const PassOwnPtr<T>& o)
-{
- PtrType ptr = m_ptr;
- m_ptr = o.leakPtr();
- ASSERT(!ptr || m_ptr != ptr);
- OwnedPtrDeleter<T>::deletePtr(ptr);
- return *this;
+template <typename T>
+inline OwnPtr<T>& OwnPtr<T>::operator=(const PassOwnPtr<T>& o) {
+ PtrType ptr = m_ptr;
+ m_ptr = o.leakPtr();
+ ASSERT(!ptr || m_ptr != ptr);
+ OwnedPtrDeleter<T>::deletePtr(ptr);
+ return *this;
}
template <typename T>
-template <typename U> inline OwnPtr<T>& OwnPtr<T>::operator=(const PassOwnPtr<U>& o)
-{
- static_assert(!std::is_array<T>::value, "pointers to array must never be converted");
- PtrType ptr = m_ptr;
- m_ptr = o.leakPtr();
- ASSERT(!ptr || m_ptr != ptr);
- OwnedPtrDeleter<T>::deletePtr(ptr);
- return *this;
+template <typename U>
+inline OwnPtr<T>& OwnPtr<T>::operator=(const PassOwnPtr<U>& o) {
+ static_assert(!std::is_array<T>::value,
+ "pointers to array must never be converted");
+ PtrType ptr = m_ptr;
+ m_ptr = o.leakPtr();
+ ASSERT(!ptr || m_ptr != ptr);
+ OwnedPtrDeleter<T>::deletePtr(ptr);
+ return *this;
}
-template <typename T> inline OwnPtr<T>::OwnPtr(OwnPtr<T>&& o)
- : m_ptr(o.leakPtr())
-{
-}
+template <typename T>
+inline OwnPtr<T>::OwnPtr(OwnPtr<T>&& o) : m_ptr(o.leakPtr()) {}
template <typename T>
-template <typename U> inline OwnPtr<T>::OwnPtr(OwnPtr<U>&& o)
- : m_ptr(o.leakPtr())
-{
- static_assert(!std::is_array<T>::value, "pointers to array must never be converted");
+template <typename U>
+inline OwnPtr<T>::OwnPtr(OwnPtr<U>&& o) : m_ptr(o.leakPtr()) {
+ static_assert(!std::is_array<T>::value,
+ "pointers to array must never be converted");
}
-template <typename T> inline OwnPtr<T>& OwnPtr<T>::operator=(OwnPtr<T>&& o)
-{
- PtrType ptr = m_ptr;
- m_ptr = o.leakPtr();
- ASSERT(!ptr || m_ptr != ptr);
- OwnedPtrDeleter<T>::deletePtr(ptr);
+template <typename T>
+inline OwnPtr<T>& OwnPtr<T>::operator=(OwnPtr<T>&& o) {
+ PtrType ptr = m_ptr;
+ m_ptr = o.leakPtr();
+ ASSERT(!ptr || m_ptr != ptr);
+ OwnedPtrDeleter<T>::deletePtr(ptr);
- return *this;
+ return *this;
}
template <typename T>
-template <typename U> inline OwnPtr<T>& OwnPtr<T>::operator=(OwnPtr<U>&& o)
-{
- static_assert(!std::is_array<T>::value, "pointers to array must never be converted");
- PtrType ptr = m_ptr;
- m_ptr = o.leakPtr();
- ASSERT(!ptr || m_ptr != ptr);
- OwnedPtrDeleter<T>::deletePtr(ptr);
-
- return *this;
+template <typename U>
+inline OwnPtr<T>& OwnPtr<T>::operator=(OwnPtr<U>&& o) {
+ static_assert(!std::is_array<T>::value,
+ "pointers to array must never be converted");
+ PtrType ptr = m_ptr;
+ m_ptr = o.leakPtr();
+ ASSERT(!ptr || m_ptr != ptr);
+ OwnedPtrDeleter<T>::deletePtr(ptr);
+
+ return *this;
}
-template <typename T> inline void swap(OwnPtr<T>& a, OwnPtr<T>& b)
-{
- a.swap(b);
+template <typename T>
+inline void swap(OwnPtr<T>& a, OwnPtr<T>& b) {
+ a.swap(b);
}
-template <typename T, typename U> inline bool operator==(const OwnPtr<T>& a, U* b)
-{
- return a.get() == b;
+template <typename T, typename U>
+inline bool operator==(const OwnPtr<T>& a, U* b) {
+ return a.get() == b;
}
-template <typename T, typename U> inline bool operator==(T* a, const OwnPtr<U>& b)
-{
- return a == b.get();
+template <typename T, typename U>
+inline bool operator==(T* a, const OwnPtr<U>& b) {
+ return a == b.get();
}
-template <typename T, typename U> inline bool operator!=(const OwnPtr<T>& a, U* b)
-{
- return a.get() != b;
+template <typename T, typename U>
+inline bool operator!=(const OwnPtr<T>& a, U* b) {
+ return a.get() != b;
}
-template <typename T, typename U> inline bool operator!=(T* a, const OwnPtr<U>& b)
-{
- return a != b.get();
+template <typename T, typename U>
+inline bool operator!=(T* a, const OwnPtr<U>& b) {
+ return a != b.get();
}
-template <typename T> inline typename OwnPtr<T>::PtrType getPtr(const OwnPtr<T>& p)
-{
- return p.get();
+template <typename T>
+inline typename OwnPtr<T>::PtrType getPtr(const OwnPtr<T>& p) {
+ return p.get();
}
-} // namespace WTF
+} // namespace WTF
using WTF::OwnPtr;
-#endif // WTF_OwnPtr_h
+#endif // WTF_OwnPtr_h
« no previous file with comments | « third_party/WebKit/Source/wtf/OptionalTest.cpp ('k') | third_party/WebKit/Source/wtf/OwnPtrCommon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698