Changeset 155407 in webkit

Timestamp:

Sep 9, 2013, 5:43:51 PM (13 years ago)

Author:

andersca@apple.com

Message:

Introduce WTF::createOwned
​https://bugs.webkit.org/show_bug.cgi?id=121059

Reviewed by Andreas Kling.

WTF::createOwned is a function template that does adoptPtr + new in a single function call,
with all the arguments being perfectly forwarded thanks to C++11.

Being forward-looking, createOwned returns an OwnPtr rather than a PassOwnPtr since the plan is
to get rid of PassOwnPtr and just use std::move instead.

• wtf/FilePrintStream.cpp:
• wtf/FilePrintStream.h:
• wtf/HashTable.h:
• wtf/ListHashSet.h:
• wtf/OwnPtr.h:

(WTF::OwnPtr::OwnPtr):
(WTF::createOwned):
(WTF::createThread):
(WTF::establishIdentifierForPthreadHandle):
(WTF::createThreadInternal):
(WTF::Collator::userDefault):
(WTF::Collator::userDefault):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/FilePrintStream.cpp (modified) (1 diff)
• wtf/FilePrintStream.h (modified) (2 diffs)
• wtf/HashTable.h (modified) (2 diffs)
• wtf/ListHashSet.h (modified) (2 diffs)
• wtf/OwnPtr.h (modified) (3 diffs)
• wtf/Threading.cpp (modified) (2 diffs)
• wtf/ThreadingPthreads.cpp (modified) (2 diffs)
• wtf/unicode/Collator.h (modified) (2 diffs)
• wtf/unicode/CollatorDefault.cpp (modified) (1 diff)
• wtf/unicode/icu/CollatorICU.cpp (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-09-09  Anders Carlsson  <andersca@apple.com>
+
+        Introduce WTF::createOwned
+        https://bugs.webkit.org/show_bug.cgi?id=121059
+
+        Reviewed by Andreas Kling.
+
+        WTF::createOwned is a function template that does adoptPtr + new in a single function call,
+        with all the arguments being perfectly forwarded thanks to C++11.
+        
+        Being forward-looking, createOwned returns an OwnPtr rather than a PassOwnPtr since the plan is 
+        to get rid of PassOwnPtr and just use std::move instead.
+
+        * wtf/FilePrintStream.cpp:
+        * wtf/FilePrintStream.h:
+        * wtf/HashTable.h:
+        * wtf/ListHashSet.h:
+        * wtf/OwnPtr.h:
+        (WTF::OwnPtr::OwnPtr):
+        (WTF::createOwned):
+        (WTF::createThread):
+        (WTF::establishIdentifierForPthreadHandle):
+        (WTF::createThreadInternal):
+        (WTF::Collator::userDefault):
+        (WTF::Collator::userDefault):
+
 2013-09-09  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WTF/wtf/FilePrintStream.cpp

@@ -42 +42 @@
 }
 
-PassOwnPtr<FilePrintStream> FilePrintStream::open(const char* filename, const char* mode)
+OwnPtr<FilePrintStream> FilePrintStream::open(const char* filename, const char* mode)
 {
     FILE* file = fopen(filename, mode);
     if (!file)
-        return PassOwnPtr<FilePrintStream>();
-    
-    return adoptPtr(new FilePrintStream(file));
+        return nullptr;
+
+    return createOwned<FilePrintStream>(file);
 }
 

trunk/Source/WTF/wtf/FilePrintStream.h

@@ -28 +28 @@
 
 #include <stdio.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/PrintStream.h>
+#include <wtf/OwnPtr.h>
 
 namespace WTF {
@@ -43 +43 @@
     virtual ~FilePrintStream();
     
-    WTF_EXPORT_PRIVATE static PassOwnPtr<FilePrintStream> open(const char* filename, const char* mode);
+    WTF_EXPORT_PRIVATE static OwnPtr<FilePrintStream> open(const char* filename, const char* mode);
     
     FILE* file() { return m_file; }

trunk/Source/WTF/wtf/HashTable.h

@@ -556 +556 @@
 #if CHECK_HASHTABLE_ITERATORS
         , m_iterators(0)
-        , m_mutex(adoptPtr(new Mutex))
-#endif
-#if DUMP_HASHTABLE_STATS_PER_TABLE
-        , m_stats(adoptPtr(new Stats))
+        , m_mutex(createOwned<Mutex>())
+#endif
+#if DUMP_HASHTABLE_STATS_PER_TABLE
+        , m_stats(createOwned<Stats>())
 #endif
     {
@@ -1167 +1167 @@
 #if CHECK_HASHTABLE_ITERATORS
         , m_iterators(0)
-        , m_mutex(adoptPtr(new Mutex))
-#endif
-#if DUMP_HASHTABLE_STATS_PER_TABLE
-        , m_stats(adoptPtr(new Stats(*other.m_stats)))
+        , m_mutex(createOwned<Mutex>())
+#endif
+#if DUMP_HASHTABLE_STATS_PER_TABLE
+        , m_stats(createOwned<Stats>(*other.m_stats))
 #endif
     {

trunk/Source/WTF/wtf/ListHashSet.h

@@ -512 +512 @@
         : m_head(0)
         , m_tail(0)
-        , m_allocator(adoptPtr(new NodeAllocator))
+        , m_allocator(createOwned<NodeAllocator>())
     {
     }
@@ -520 +520 @@
         : m_head(0)
         , m_tail(0)
-        , m_allocator(adoptPtr(new NodeAllocator))
+        , m_allocator(createOwned<NodeAllocator>())
     {
         const_iterator end = other.end();

trunk/Source/WTF/wtf/OwnPtr.h

@@ -37 +37 @@
 
     template<typename T> class OwnPtr {
-#if COMPILER_SUPPORTS(CXX_RVALUE_REFERENCES)
-        // If rvalue references are not supported, the copy constructor is
-        // public so OwnPtr cannot be marked noncopyable. See note below.
-        WTF_MAKE_NONCOPYABLE(OwnPtr);
-#endif
     public:
         typedef typename std::remove_pointer<T>::type ValueType;
@@ -92 +87 @@
 
     private:
+        explicit OwnPtr(PtrType ptr) : m_ptr(ptr) { }
+
+        template<typename U> friend OwnPtr<U> createOwned();
+        template<typename U, typename A1> friend OwnPtr<U> createOwned(A1&&);
+        template<typename U, typename A1, typename A2> friend OwnPtr<U> createOwned(A1&&, A2&&);
+
 #if !COMPILER_SUPPORTS(CXX_RVALUE_REFERENCES)
         // If rvalue references are supported, noncopyable takes care of this.
@@ -213 +214 @@
     }
 
+template<typename T>
+inline OwnPtr<T> createOwned()
+{
+    return OwnPtr<T>(new T);
+}
+
+template<typename T, typename A1>
+inline OwnPtr<T> createOwned(A1&& a1)
+{
+    return OwnPtr<T>(new T(std::forward<A1>(a1)));
+}
+
+template<typename T, typename A1, typename A2>
+inline OwnPtr<T> createOwned(A1&& a1, A2&& a2)
+{
+    return OwnPtr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2)));
+}
+
 } // namespace WTF
 
 using WTF::OwnPtr;
+using WTF::createOwned;
 
 #endif // WTF_OwnPtr_h

trunk/Source/WTF/wtf/Threading.cpp

@@ -117 +117 @@
 ThreadIdentifier createThread(ThreadFunctionWithReturnValue entryPoint, void* data, const char* name)
 {
-    OwnPtr<ThreadFunctionWithReturnValueInvocation> invocation = adoptPtr(new ThreadFunctionWithReturnValueInvocation(entryPoint, data));
+    auto invocation = createOwned<ThreadFunctionWithReturnValueInvocation>(entryPoint, data);
 
     // Balanced by adoptPtr() in compatEntryPoint.
@@ -137 +137 @@
 ThreadIdentifier createThread(ThreadFunctionWithReturnValue entryPoint, void* data)
 {
-    OwnPtr<ThreadFunctionWithReturnValueInvocation> invocation = adoptPtr(new ThreadFunctionWithReturnValueInvocation(entryPoint, data));
+    auto invocation = createOwned<ThreadFunctionWithReturnValueInvocation>(entryPoint, data);
 
     // Balanced by adoptPtr() in compatEntryPoint.

trunk/Source/WTF/wtf/ThreadingPthreads.cpp

@@ -180 +180 @@
     MutexLocker locker(threadMapMutex());
     static ThreadIdentifier identifierCount = 1;
-    threadMap().add(identifierCount, adoptPtr(new PthreadState(pthreadHandle)));
+    threadMap().add(identifierCount, createOwned<PthreadState>(pthreadHandle).release());
     return identifierCount++;
 }
@@ -199 +199 @@
 ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char*)
 {
-    OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(new ThreadFunctionInvocation(entryPoint, data));
+    auto invocation = WTF::createOwned<ThreadFunctionInvocation>(entryPoint, data);
     pthread_t threadHandle;
     if (pthread_create(&threadHandle, 0, wtfThreadEntryPoint, invocation.get())) {

trunk/Source/WTF/wtf/unicode/Collator.h

@@ -31 +31 @@
 
 #include <wtf/Noncopyable.h>
-#include <wtf/PassOwnPtr.h>
+#include <wtf/OwnPtr.h>
 #include <wtf/unicode/Unicode.h>
 
@@ -49 +49 @@
         WTF_EXPORT_PRIVATE void setOrderLowerFirst(bool);
 
-        WTF_EXPORT_PRIVATE static PassOwnPtr<Collator> userDefault();
+        WTF_EXPORT_PRIVATE static OwnPtr<Collator> userDefault();
 
         WTF_EXPORT_PRIVATE Result collate(const ::UChar*, size_t, const ::UChar*, size_t) const;

trunk/Source/WTF/wtf/unicode/CollatorDefault.cpp

@@ -46 +46 @@
 }
 
-PassOwnPtr<Collator> Collator::userDefault()
+OwnPtr<Collator> Collator::userDefault()
 {
-    return adoptPtr(new Collator(0));
+    return createOwned<Collator>(0);
 }
 

trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp

@@ -59 +59 @@
 }
 
-PassOwnPtr<Collator> Collator::userDefault()
+OwnPtr<Collator> Collator::userDefault()
 {
 #if OS(DARWIN) && USE(CF)
@@ -72 +72 @@
     char buf[256];
     if (!collationOrder)
-        return adoptPtr(new Collator(""));
+        return createOwned<Collator>("");
     CFStringGetCString(collationOrder, buf, sizeof(buf), kCFStringEncodingASCII);
-    return adoptPtr(new Collator(buf));
+    return createOwned<Collator>(buf);
 #else
-    return adoptPtr(new Collator(0));
+    return createOwned<Collator>(static_cast<const char*>(0));
 #endif
 }