From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/Modules/webaudio/AudioParamTimeline.h | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'Source/WebCore/Modules/webaudio/AudioParamTimeline.h') diff --git a/Source/WebCore/Modules/webaudio/AudioParamTimeline.h b/Source/WebCore/Modules/webaudio/AudioParamTimeline.h index 4e9f0a4a3..148391731 100644 --- a/Source/WebCore/Modules/webaudio/AudioParamTimeline.h +++ b/Source/WebCore/Modules/webaudio/AudioParamTimeline.h @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -26,13 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef AudioParamTimeline_h -#define AudioParamTimeline_h +#pragma once #include "AudioContext.h" -#include #include -#include +#include #include #include @@ -53,7 +51,7 @@ public: // hasValue is set to true if a valid timeline value is returned. // otherwise defaultValue is returned. - float valueForContextTime(AudioContext*, float defaultValue, bool& hasValue); + float valueForContextTime(AudioContext&, float defaultValue, bool& hasValue); // Given the time range, calculates parameter values into the values buffer // and returns the last parameter value calculated for "values" or the defaultValue if none were calculated. @@ -76,13 +74,13 @@ private: LastType }; - ParamEvent(Type type, float value, float time, float timeConstant, float duration, PassRefPtr curve) + ParamEvent(Type type, float value, float time, float timeConstant, float duration, RefPtr&& curve) : m_type(type) , m_value(value) , m_time(time) , m_timeConstant(timeConstant) , m_duration(duration) - , m_curve(curve) + , m_curve(WTFMove(curve)) { } @@ -107,9 +105,7 @@ private: Vector m_events; - std::mutex m_eventsMutex; + Lock m_eventsMutex; }; } // namespace WebCore - -#endif // AudioParamTimeline_h -- cgit v1.2.1