Changeset 201496 in webkit

Timestamp:

May 29, 2016, 9:30:22 PM (10 years ago)

Author:

beidson@apple.com

Message:

Make ScriptExecutionContext::Task work in terms of wtf::NoncopyableFunction instead of std::function.
​https://bugs.webkit.org/show_bug.cgi?id=158187

Reviewed by Chris Dumez.

No new tests (Refactor, no behavior change).

Also make postTask take an rvalue reference.

• bindings/js/JSDOMGlobalObjectTask.cpp:

(WebCore::JSGlobalObjectTask::JSGlobalObjectTask):

• dom/Document.cpp:

(WebCore::Document::postTask):

• dom/Document.h:

• dom/ScriptExecutionContext.h:

(WebCore::ScriptExecutionContext::Task::Task):

• workers/WorkerGlobalScope.cpp:

(WebCore::WorkerGlobalScope::postTask):

• workers/WorkerGlobalScope.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDOMGlobalObjectTask.cpp (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• dom/Document.h (modified) (1 diff)
• dom/ScriptExecutionContext.h (modified) (5 diffs)
• workers/WorkerGlobalScope.cpp (modified) (1 diff)
• workers/WorkerGlobalScope.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-29  Brady Eidson  <beidson@apple.com>
+
+        Make ScriptExecutionContext::Task work in terms of wtf::NoncopyableFunction instead of std::function.
+        https://bugs.webkit.org/show_bug.cgi?id=158187
+
+        Reviewed by Chris Dumez.
+
+        No new tests (Refactor, no behavior change).
+
+        Also make postTask take an rvalue reference.
+
+        * bindings/js/JSDOMGlobalObjectTask.cpp:
+        (WebCore::JSGlobalObjectTask::JSGlobalObjectTask):
+        
+        * dom/Document.cpp:
+        (WebCore::Document::postTask):
+        * dom/Document.h:
+        
+        * dom/ScriptExecutionContext.h:
+        (WebCore::ScriptExecutionContext::Task::Task):
+        
+        * workers/WorkerGlobalScope.cpp:
+        (WebCore::WorkerGlobalScope::postTask):
+        * workers/WorkerGlobalScope.h:
+
 2016-05-28  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp

@@ -81 +81 @@
 
 JSGlobalObjectTask::JSGlobalObjectTask(JSDOMGlobalObject* globalObject, Ref<Microtask>&& task)
-    : ScriptExecutionContext::Task(nullptr)
+    : ScriptExecutionContext::Task({ })
 {
     RefPtr<JSGlobalObjectCallback> callback = JSGlobalObjectCallback::create(globalObject, WTFMove(task));

trunk/Source/WebCore/dom/Document.cpp

@@ -5385 +5385 @@
 }
 
-void Document::postTask(Task task)
+void Document::postTask(Task&& task)
 {
     callOnMainThread([documentReference = m_weakFactory.createWeakPtr(), task = WTFMove(task)]() mutable {

trunk/Source/WebCore/dom/Document.h

@@ -976 +976 @@
     void parseDNSPrefetchControlHeader(const String&);
 
-    void postTask(Task) final; // Executes the task on context's thread asynchronously.
+    void postTask(Task&&) final; // Executes the task on context's thread asynchronously.
 
 #if ENABLE(REQUEST_ANIMATION_FRAME)

trunk/Source/WebCore/dom/ScriptExecutionContext.h

@@ -36 +36 @@
 #include <runtime/ConsoleTypes.h>
 #include <wtf/HashSet.h>
+#include <wtf/NoncopyableFunction.h>
 
 namespace JSC {
@@ -133 +134 @@
         enum CleanupTaskTag { CleanupTask };
 
-        template<typename T, typename = typename std::enable_if<!std::is_base_of<Task, T>::value && std::is_convertible<T, std::function<void (ScriptExecutionContext&)>>::value>::type>
+        template<typename T, typename = typename std::enable_if<!std::is_base_of<Task, T>::value && std::is_convertible<T, NoncopyableFunction<void (ScriptExecutionContext&)>>::value>::type>
         Task(T task)
             : m_task(WTFMove(task))
@@ -140 +141 @@
         }
 
-        Task(std::function<void()> task)
+        Task(std::function<void ()> task)
             : m_task([task](ScriptExecutionContext&) { task(); })
             , m_isCleanupTask(false)
@@ -146 +147 @@
         }
 
-        template<typename T, typename = typename std::enable_if<std::is_convertible<T, std::function<void (ScriptExecutionContext&)>>::value>::type>
+        template<typename T, typename = typename std::enable_if<std::is_convertible<T, NoncopyableFunction<void (ScriptExecutionContext&)>>::value>::type>
         Task(CleanupTaskTag, T task)
             : m_task(WTFMove(task))
@@ -163 +164 @@
 
     protected:
-        std::function<void (ScriptExecutionContext&)> m_task;
+        NoncopyableFunction<void (ScriptExecutionContext&)> m_task;
         bool m_isCleanupTask;
     };
 
-    virtual void postTask(Task) = 0; // Executes the task on context's thread asynchronously.
+    virtual void postTask(Task&&) = 0; // Executes the task on context's thread asynchronously.
 
     template<typename... Arguments>

trunk/Source/WebCore/workers/WorkerGlobalScope.cpp

@@ -174 +174 @@
 }
 
-void WorkerGlobalScope::postTask(Task task)
+void WorkerGlobalScope::postTask(Task&& task)
 {
     thread().runLoop().postTask(WTFMove(task));

trunk/Source/WebCore/workers/WorkerGlobalScope.h

@@ -89 +89 @@
     using ScriptExecutionContext::hasPendingActivity;
 
-    void postTask(Task) override; // Executes the task on context's thread asynchronously.
+    void postTask(Task&&) final; // Executes the task on context's thread asynchronously.
 
     // WorkerGlobalScope