Changeset 201614 in webkit

Timestamp:

Jun 2, 2016, 1:35:14 PM (10 years ago)

Author:

Chris Dumez

Message:

ScriptExecutionContext::Task constructor should take a NoncopyableFunction<void ()> as parameter
​https://bugs.webkit.org/show_bug.cgi?id=158309

Reviewed by Brady Eidson.

ScriptExecutionContext::Task constructor should take a NoncopyableFunction<void ()>
as parameter for consistency with the other constructor and because this can be
called cross-thread.

• Modules/webaudio/AudioContext.cpp:

(WebCore::AudioContext::suspend):
(WebCore::AudioContext::resume):
(WebCore::AudioContext::close):
(WebCore::AudioContext::suspendPlayback):
(WebCore::AudioContext::mayResumePlayback):

• Modules/webaudio/AudioDestinationNode.h:

(WebCore::AudioDestinationNode::resume):
(WebCore::AudioDestinationNode::suspend):
(WebCore::AudioDestinationNode::close):

• Modules/webaudio/DefaultAudioDestinationNode.cpp:

(WebCore::DefaultAudioDestinationNode::resume):
(WebCore::DefaultAudioDestinationNode::suspend):
(WebCore::DefaultAudioDestinationNode::close):

• Modules/webaudio/DefaultAudioDestinationNode.h:
• dom/ScriptExecutionContext.h:

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webaudio/AudioContext.cpp (modified) (5 diffs)
• Modules/webaudio/AudioDestinationNode.h (modified) (2 diffs)
• Modules/webaudio/DefaultAudioDestinationNode.cpp (modified) (3 diffs)
• Modules/webaudio/DefaultAudioDestinationNode.h (modified) (1 diff)
• dom/ScriptExecutionContext.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-02  Chris Dumez  <cdumez@apple.com>
+
+        ScriptExecutionContext::Task constructor should take a NoncopyableFunction<void ()> as parameter
+        https://bugs.webkit.org/show_bug.cgi?id=158309
+
+        Reviewed by Brady Eidson.
+
+        ScriptExecutionContext::Task constructor should take a NoncopyableFunction<void ()>
+        as parameter for consistency with the other constructor and because this can be
+        called cross-thread.
+
+        * Modules/webaudio/AudioContext.cpp:
+        (WebCore::AudioContext::suspend):
+        (WebCore::AudioContext::resume):
+        (WebCore::AudioContext::close):
+        (WebCore::AudioContext::suspendPlayback):
+        (WebCore::AudioContext::mayResumePlayback):
+        * Modules/webaudio/AudioDestinationNode.h:
+        (WebCore::AudioDestinationNode::resume):
+        (WebCore::AudioDestinationNode::suspend):
+        (WebCore::AudioDestinationNode::close):
+        * Modules/webaudio/DefaultAudioDestinationNode.cpp:
+        (WebCore::DefaultAudioDestinationNode::resume):
+        (WebCore::DefaultAudioDestinationNode::suspend):
+        (WebCore::DefaultAudioDestinationNode::close):
+        * Modules/webaudio/DefaultAudioDestinationNode.h:
+        * dom/ScriptExecutionContext.h:
+        (WebCore::ScriptExecutionContext::Task::Task):
+
 2016-06-02  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp

@@ -1062 +1062 @@
     lazyInitialize();
 
-    RefPtr<AudioContext> protectedThis(this);
-    m_destinationNode->suspend([protectedThis] {
-        protectedThis->setState(State::Suspended);
+    m_destinationNode->suspend([this, protectedThis = Ref<AudioContext>(*this)] {
+        setState(State::Suspended);
     });
 }
@@ -1092 +1091 @@
     lazyInitialize();
 
-    RefPtr<AudioContext> protectedThis(this);
-    m_destinationNode->resume([protectedThis] {
-        protectedThis->setState(State::Running);
+    m_destinationNode->resume([this, protectedThis = Ref<AudioContext>(*this)] {
+        setState(State::Running);
     });
 }
@@ -1114 +1112 @@
     lazyInitialize();
 
-    RefPtr<AudioContext> protectedThis(this);
-    m_destinationNode->close([protectedThis] {
-        protectedThis->setState(State::Closed);
-        protectedThis->uninitialize();
+    m_destinationNode->close([this, protectedThis = Ref<AudioContext>(*this)] {
+        setState(State::Closed);
+        uninitialize();
     });
 }
@@ -1135 +1132 @@
     lazyInitialize();
 
-    RefPtr<AudioContext> protectedThis(this);
-    m_destinationNode->suspend([protectedThis] {
-        bool interrupted = protectedThis->m_mediaSession->state() == PlatformMediaSession::Interrupted;
-        protectedThis->setState(interrupted ? State::Interrupted : State::Suspended);
+    m_destinationNode->suspend([this, protectedThis = Ref<AudioContext>(*this)] {
+        bool interrupted = m_mediaSession->state() == PlatformMediaSession::Interrupted;
+        setState(interrupted ? State::Interrupted : State::Suspended);
     });
 }
@@ -1157 +1153 @@
     lazyInitialize();
 
-    RefPtr<AudioContext> protectedThis(this);
-    m_destinationNode->resume([protectedThis] {
-        protectedThis->setState(State::Running);
+    m_destinationNode->resume([this, protectedThis = Ref<AudioContext>(*this)] {
+        setState(State::Running);
     });
 }

trunk/Source/WebCore/Modules/webaudio/AudioDestinationNode.h

@@ -31 +31 @@
 #include "AudioNode.h"
 #include "AudioSourceProvider.h"
+#include <wtf/NoncopyableFunction.h>
 
 namespace WebCore {
@@ -59 +60 @@
 
     virtual void startRendering() = 0;
-    virtual void resume(std::function<void()>) { }
-    virtual void suspend(std::function<void()>) { }
-    virtual void close(std::function<void()>) { }
+    virtual void resume(NoncopyableFunction<void ()>&&) { }
+    virtual void suspend(NoncopyableFunction<void ()>&&) { }
+    virtual void close(NoncopyableFunction<void ()>&&) { }
 
     virtual bool isPlaying() { return false; }

trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.cpp

@@ -107 +107 @@
 }
 
-void DefaultAudioDestinationNode::resume(std::function<void()> function)
+void DefaultAudioDestinationNode::resume(NoncopyableFunction<void ()>&& function)
 {
     ASSERT(isInitialized());
@@ -113 +113 @@
         m_destination->start();
     if (auto scriptExecutionContext = context().scriptExecutionContext())
-        scriptExecutionContext->postTask(function);
+        scriptExecutionContext->postTask(WTFMove(function));
 }
 
-void DefaultAudioDestinationNode::suspend(std::function<void()> function)
+void DefaultAudioDestinationNode::suspend(NoncopyableFunction<void ()>&& function)
 {
     ASSERT(isInitialized());
@@ -122 +122 @@
         m_destination->stop();
     if (auto scriptExecutionContext = context().scriptExecutionContext())
-        scriptExecutionContext->postTask(function);
+        scriptExecutionContext->postTask(WTFMove(function));
 }
 
-void DefaultAudioDestinationNode::close(std::function<void()> function)
+void DefaultAudioDestinationNode::close(NoncopyableFunction<void()>&& function)
 {
     ASSERT(isInitialized());
     uninitialize();
     if (auto scriptExecutionContext = context().scriptExecutionContext())
-        scriptExecutionContext->postTask(function);
+        scriptExecutionContext->postTask(WTFMove(function));
 }
 

trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.h

@@ -51 +51 @@
     void enableInput(const String& inputDeviceId) override;
     void startRendering() override;
-    void resume(std::function<void()>) override;
-    void suspend(std::function<void()>) override;
-    void close(std::function<void()>) override;
+    void resume(NoncopyableFunction<void ()>&&) override;
+    void suspend(NoncopyableFunction<void ()>&&) override;
+    void close(NoncopyableFunction<void ()>&&) override;
     unsigned long maxChannelCount() const override;
     bool isPlaying() override;

trunk/Source/WebCore/dom/ScriptExecutionContext.h

@@ -141 +141 @@
         }
 
-        Task(std::function<void ()> task)
-            : m_task([task](ScriptExecutionContext&) { task(); })
+        Task(NoncopyableFunction<void ()>&& task)
+            : m_task([task = WTFMove(task)](ScriptExecutionContext&) { task(); })
             , m_isCleanupTask(false)
         {