Changeset 195785 in webkit

Timestamp:

Jan 28, 2016 3:04:03 PM (8 years ago)

Author:

dbates@webkit.org

Message:

Cleanup: Make DedicatedWorkerThread::create() an inline template method
​https://bugs.webkit.org/show_bug.cgi?id=153612

Reviewed by Andy Estes.

Make use of variadic template arguments and std::forward() to forward the arguments passed
to DedicatedWorkerThread::create() to DedicatedWorkerThread::DedicatedWorkerThread(). This
removes the need to duplicate code whenever we modify the parameter types or number of
parameters taken by DedicatedWorkerThread::DedicatedWorkerThread().

• workers/DedicatedWorkerThread.cpp:

(WebCore::DedicatedWorkerThread::create): Deleted.

• workers/DedicatedWorkerThread.h: Reorganized listing of member functions such that we

group the creation/constructor and destructor functions.
(WebCore::DedicatedWorkerThread::create): Modified to be an inline template with variadic
parameters that std::forward()s its arguments to DedicatedWorkerThread::DedicatedWorkerThread().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• workers/DedicatedWorkerThread.cpp (modified) (1 diff)
• workers/DedicatedWorkerThread.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-28  Daniel Bates  <dabates@apple.com>
+
+        Cleanup: Make DedicatedWorkerThread::create() an inline template method
+        https://bugs.webkit.org/show_bug.cgi?id=153612
+
+        Reviewed by Andy Estes.
+
+        Make use of variadic template arguments and std::forward() to forward the arguments passed
+        to DedicatedWorkerThread::create() to DedicatedWorkerThread::DedicatedWorkerThread(). This
+        removes the need to duplicate code whenever we modify the parameter types or number of
+        parameters taken by DedicatedWorkerThread::DedicatedWorkerThread().
+
+        * workers/DedicatedWorkerThread.cpp:
+        (WebCore::DedicatedWorkerThread::create): Deleted.
+        * workers/DedicatedWorkerThread.h: Reorganized listing of member functions such that we
+        group the creation/constructor and destructor functions.
+        (WebCore::DedicatedWorkerThread::create): Modified to be an inline template with variadic
+        parameters that std::forward()s its arguments to DedicatedWorkerThread::DedicatedWorkerThread().
+
 2016-01-28  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/workers/DedicatedWorkerThread.cpp

@@ -39 +39 @@
 namespace WebCore {
 
-Ref<DedicatedWorkerThread> DedicatedWorkerThread::create(const URL& scriptURL, const String& userAgent, const String& sourceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, const SecurityOrigin* topOrigin)
-{
-    return adoptRef(*new DedicatedWorkerThread(scriptURL, userAgent, sourceCode, workerLoaderProxy, workerObjectProxy, startMode, contentSecurityPolicy, contentSecurityPolicyType, topOrigin));
-}
-
 DedicatedWorkerThread::DedicatedWorkerThread(const URL& url, const String& userAgent, const String& sourceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, const SecurityOrigin* topOrigin)
     : WorkerThread(url, userAgent, sourceCode, workerLoaderProxy, workerObjectProxy, startMode, contentSecurityPolicy, contentSecurityPolicyType, topOrigin)

trunk/Source/WebCore/workers/DedicatedWorkerThread.h

@@ -40 +40 @@
     class DedicatedWorkerThread : public WorkerThread {
     public:
-        static Ref<DedicatedWorkerThread> create(const URL& scriptURL, const String& userAgent, const String& sourceCode, WorkerLoaderProxy&, WorkerObjectProxy&, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, const SecurityOrigin* topOrigin);
+        template<class... Args> static Ref<DedicatedWorkerThread> create(Args&&... args)
+        {
+            return adoptRef(*new DedicatedWorkerThread(std::forward<Args>(args)...));
+        }
+        virtual ~DedicatedWorkerThread();
+
         WorkerObjectProxy& workerObjectProxy() const { return m_workerObjectProxy; }
-        virtual ~DedicatedWorkerThread();
 
     protected: