<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[201614] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/201614">201614</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-06-02 13:35:14 -0700 (Thu, 02 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioContextcpp">trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioDestinationNodeh">trunk/Source/WebCore/Modules/webaudio/AudioDestinationNode.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioDefaultAudioDestinationNodecpp">trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioDefaultAudioDestinationNodeh">trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201613 => 201614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-02 20:05:08 UTC (rev 201613)
+++ trunk/Source/WebCore/ChangeLog 2016-06-02 20:35:14 UTC (rev 201614)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+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):
+
</ins><span class="cx"> 2016-06-02 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix a couple of mistakes in CSSParserValue memory management
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp (201613 => 201614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2016-06-02 20:05:08 UTC (rev 201613)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2016-06-02 20:35:14 UTC (rev 201614)
</span><span class="lines">@@ -1061,9 +1061,8 @@
</span><span class="cx">
</span><span class="cx"> lazyInitialize();
</span><span class="cx">
</span><del>- RefPtr<AudioContext> protectedThis(this);
- m_destinationNode->suspend([protectedThis] {
- protectedThis->setState(State::Suspended);
</del><ins>+ m_destinationNode->suspend([this, protectedThis = Ref<AudioContext>(*this)] {
+ setState(State::Suspended);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1091,9 +1090,8 @@
</span><span class="cx">
</span><span class="cx"> lazyInitialize();
</span><span class="cx">
</span><del>- RefPtr<AudioContext> protectedThis(this);
- m_destinationNode->resume([protectedThis] {
- protectedThis->setState(State::Running);
</del><ins>+ m_destinationNode->resume([this, protectedThis = Ref<AudioContext>(*this)] {
+ setState(State::Running);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1113,10 +1111,9 @@
</span><span class="cx">
</span><span class="cx"> lazyInitialize();
</span><span class="cx">
</span><del>- RefPtr<AudioContext> protectedThis(this);
- m_destinationNode->close([protectedThis] {
- protectedThis->setState(State::Closed);
- protectedThis->uninitialize();
</del><ins>+ m_destinationNode->close([this, protectedThis = Ref<AudioContext>(*this)] {
+ setState(State::Closed);
+ uninitialize();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1134,10 +1131,9 @@
</span><span class="cx">
</span><span class="cx"> lazyInitialize();
</span><span class="cx">
</span><del>- RefPtr<AudioContext> protectedThis(this);
- m_destinationNode->suspend([protectedThis] {
- bool interrupted = protectedThis->m_mediaSession->state() == PlatformMediaSession::Interrupted;
- protectedThis->setState(interrupted ? State::Interrupted : State::Suspended);
</del><ins>+ m_destinationNode->suspend([this, protectedThis = Ref<AudioContext>(*this)] {
+ bool interrupted = m_mediaSession->state() == PlatformMediaSession::Interrupted;
+ setState(interrupted ? State::Interrupted : State::Suspended);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1156,9 +1152,8 @@
</span><span class="cx">
</span><span class="cx"> lazyInitialize();
</span><span class="cx">
</span><del>- RefPtr<AudioContext> protectedThis(this);
- m_destinationNode->resume([protectedThis] {
- protectedThis->setState(State::Running);
</del><ins>+ m_destinationNode->resume([this, protectedThis = Ref<AudioContext>(*this)] {
+ setState(State::Running);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioDestinationNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioDestinationNode.h (201613 => 201614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioDestinationNode.h 2016-06-02 20:05:08 UTC (rev 201613)
+++ trunk/Source/WebCore/Modules/webaudio/AudioDestinationNode.h 2016-06-02 20:35:14 UTC (rev 201614)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "AudioIOCallback.h"
</span><span class="cx"> #include "AudioNode.h"
</span><span class="cx"> #include "AudioSourceProvider.h"
</span><ins>+#include <wtf/NoncopyableFunction.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -58,9 +59,9 @@
</span><span class="cx"> virtual void enableInput(const String& inputDeviceId) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void startRendering() = 0;
</span><del>- virtual void resume(std::function<void()>) { }
- virtual void suspend(std::function<void()>) { }
- virtual void close(std::function<void()>) { }
</del><ins>+ virtual void resume(NoncopyableFunction<void ()>&&) { }
+ virtual void suspend(NoncopyableFunction<void ()>&&) { }
+ virtual void close(NoncopyableFunction<void ()>&&) { }
</ins><span class="cx">
</span><span class="cx"> virtual bool isPlaying() { return false; }
</span><span class="cx"> void isPlayingDidChange() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioDefaultAudioDestinationNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.cpp (201613 => 201614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.cpp 2016-06-02 20:05:08 UTC (rev 201613)
+++ trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.cpp 2016-06-02 20:35:14 UTC (rev 201614)
</span><span class="lines">@@ -106,30 +106,30 @@
</span><span class="cx"> m_destination->start();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DefaultAudioDestinationNode::resume(std::function<void()> function)
</del><ins>+void DefaultAudioDestinationNode::resume(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isInitialized());
</span><span class="cx"> if (isInitialized())
</span><span class="cx"> m_destination->start();
</span><span class="cx"> if (auto scriptExecutionContext = context().scriptExecutionContext())
</span><del>- scriptExecutionContext->postTask(function);
</del><ins>+ scriptExecutionContext->postTask(WTFMove(function));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void DefaultAudioDestinationNode::suspend(std::function<void()> function)
</del><ins>+void DefaultAudioDestinationNode::suspend(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isInitialized());
</span><span class="cx"> if (isInitialized())
</span><span class="cx"> m_destination->stop();
</span><span class="cx"> if (auto scriptExecutionContext = context().scriptExecutionContext())
</span><del>- scriptExecutionContext->postTask(function);
</del><ins>+ scriptExecutionContext->postTask(WTFMove(function));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void DefaultAudioDestinationNode::close(std::function<void()> function)
</del><ins>+void DefaultAudioDestinationNode::close(NoncopyableFunction<void()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isInitialized());
</span><span class="cx"> uninitialize();
</span><span class="cx"> if (auto scriptExecutionContext = context().scriptExecutionContext())
</span><del>- scriptExecutionContext->postTask(function);
</del><ins>+ scriptExecutionContext->postTask(WTFMove(function));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long DefaultAudioDestinationNode::maxChannelCount() const
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioDefaultAudioDestinationNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.h (201613 => 201614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.h 2016-06-02 20:05:08 UTC (rev 201613)
+++ trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.h 2016-06-02 20:35:14 UTC (rev 201614)
</span><span class="lines">@@ -50,9 +50,9 @@
</span><span class="cx"> // AudioDestinationNode
</span><span class="cx"> void enableInput(const String& inputDeviceId) override;
</span><span class="cx"> void startRendering() override;
</span><del>- void resume(std::function<void()>) override;
- void suspend(std::function<void()>) override;
- void close(std::function<void()>) override;
</del><ins>+ void resume(NoncopyableFunction<void ()>&&) override;
+ void suspend(NoncopyableFunction<void ()>&&) override;
+ void close(NoncopyableFunction<void ()>&&) override;
</ins><span class="cx"> unsigned long maxChannelCount() const override;
</span><span class="cx"> bool isPlaying() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (201613 => 201614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2016-06-02 20:05:08 UTC (rev 201613)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2016-06-02 20:35:14 UTC (rev 201614)
</span><span class="lines">@@ -140,8 +140,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Task(std::function<void ()> task)
- : m_task([task](ScriptExecutionContext&) { task(); })
</del><ins>+ Task(NoncopyableFunction<void ()>&& task)
+ : m_task([task = WTFMove(task)](ScriptExecutionContext&) { task(); })
</ins><span class="cx"> , m_isCleanupTask(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>