webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 19 insertions, 22 deletions

diff --git a/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.h b/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.h
index 574fed222..d8f6d478a 100644
--- a/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.h
+++ b/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.h
@@ -22,45 +22,42 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DefaultAudioDestinationNode_h
-#define DefaultAudioDestinationNode_h
+#pragma once
 
-#include "AudioDestination.h"
 #include "AudioDestinationNode.h"
-#include <memory>
 
 namespace WebCore {
 
-class AudioContext;
+class AudioDestination;
     
-class DefaultAudioDestinationNode : public AudioDestinationNode {
+class DefaultAudioDestinationNode final : public AudioDestinationNode {
 public:
-    static PassRefPtr<DefaultAudioDestinationNode> create(AudioContext* context)
+    static Ref<DefaultAudioDestinationNode> create(AudioContext& context)
     {
-        return adoptRef(new DefaultAudioDestinationNode(context));     
+        return adoptRef(*new DefaultAudioDestinationNode(context));     
     }
 
     virtual ~DefaultAudioDestinationNode();
     
-    // AudioNode   
-    virtual void initialize() override;
-    virtual void uninitialize() override;
-    virtual void setChannelCount(unsigned long, ExceptionCode&) override;
-
-    // AudioDestinationNode
-    virtual void enableInput(const String& inputDeviceId) override;
-    virtual void startRendering() override;
-    virtual unsigned long maxChannelCount() const override;
-    
 private:
-    explicit DefaultAudioDestinationNode(AudioContext*);
+    explicit DefaultAudioDestinationNode(AudioContext&);
     void createDestination();
 
+    void initialize() final;
+    void uninitialize() final;
+    ExceptionOr<void> setChannelCount(unsigned) final;
+
+    void enableInput(const String& inputDeviceId) final;
+    void startRendering() final;
+    void resume(Function<void ()>&&) final;
+    void suspend(Function<void ()>&&) final;
+    void close(Function<void ()>&&) final;
+    unsigned maxChannelCount() const final;
+    bool isPlaying() final;
+
     std::unique_ptr<AudioDestination> m_destination;
     String m_inputDeviceId;
-    unsigned m_numberOfInputChannels;
+    unsigned m_numberOfInputChannels { 0 };
 };
 
 } // namespace WebCore
-
-#endif // DefaultAudioDestinationNode_h