Changeset 197137 in webkit

Timestamp:

Feb 25, 2016, 3:10:31 PM (11 years ago)

Author:

barraclough@apple.com

Message:

Replace RefCounter::Token implementation with RefPtr
​https://bugs.webkit.org/show_bug.cgi?id=154698

Reviewed by Anders Carlsson.

• wtf/RefCounter.h:

(WTF::RefCounter::RefCounter):
(WTF::RefCounter::count):
(WTF::RefCounter::value):
(WTF::RefCounter<T>::~RefCounter):
(WTF::RefCounter::Token::Token): Deleted.
(WTF::RefCounter::Token::operator bool): Deleted.
(WTF::RefCounter<T>::Token::Token): Deleted.
(WTF::=): Deleted.

• Delete.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/RefCounter.h (modified) (3 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-02-25  Gavin Barraclough  <barraclough@apple.com>
+
+        Replace RefCounter::Token implementation with RefPtr
+        https://bugs.webkit.org/show_bug.cgi?id=154698
+
+        Reviewed by Anders Carlsson.
+
+        * wtf/RefCounter.h:
+        (WTF::RefCounter::RefCounter):
+        (WTF::RefCounter::count):
+        (WTF::RefCounter::value):
+        (WTF::RefCounter<T>::~RefCounter):
+        (WTF::RefCounter::Token::Token): Deleted.
+        (WTF::RefCounter::Token::operator bool): Deleted.
+        (WTF::RefCounter<T>::Token::Token): Deleted.
+        (WTF::=): Deleted.
+            - Delete.
+
 2016-02-25  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/WTF/wtf/RefCounter.h

@@ -57 +57 @@
 
 public:
-    class Token  {
-    public:
-        Token() { }
-        Token(std::nullptr_t) { }
-        inline Token(const Token&);
-        inline Token(Token&&);
-
-        inline Token& operator=(std::nullptr_t);
-        inline Token& operator=(const Token&);
-        inline Token& operator=(Token&&);
-
-        explicit operator bool() const { return m_ptr; }
-
-    private:
-        friend class RefCounter;
-        inline Token(Count* count);
-
-        RefPtr<Count> m_ptr;
-    };
+    using Token = RefPtr<Count>;
 
     WTF_EXPORT_PRIVATE RefCounter(std::function<void(bool)> = [](bool) { });
@@ -82 +64 @@
     Token count() const
     {
-        return Token(m_count);
+        return m_count;
     }
 
@@ -144 +126 @@
 }
 
-template<class T>
-inline RefCounter<T>::Token::Token(Count* count)
-    : m_ptr(count)
-{
-}
-
-template<class T>
-inline RefCounter<T>::Token::Token(const RefCounter::Token& token)
-    : m_ptr(token.m_ptr)
-{
-}
-
-template<class T>
-inline RefCounter<T>::Token::Token(RefCounter::Token&& token)
-    : m_ptr(token.m_ptr)
-{
-}
-
-template<class T>
-inline typename RefCounter<T>::Token& RefCounter<T>::Token::operator=(std::nullptr_t)
-{
-    m_ptr = nullptr;
-    return *this;
-}
-
-template<class T>
-inline typename RefCounter<T>::Token& RefCounter<T>::Token::operator=(const RefCounter<T>::Token& token)
-{
-    m_ptr = token.m_ptr;
-    return *this;
-}
-
-template<class T>
-inline typename RefCounter<T>::Token& RefCounter<T>::Token::operator=(RefCounter<T>::Token&& token)
-{
-    m_ptr = token.m_ptr;
-    return *this;
-}
-
 } // namespace WTF