webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 16 insertions, 19 deletions

diff --git a/Source/WebCore/Modules/webaudio/AnalyserNode.cpp b/Source/WebCore/Modules/webaudio/AnalyserNode.cpp
index b54d3ae28..6aff9a63d 100644
--- a/Source/WebCore/Modules/webaudio/AnalyserNode.cpp
+++ b/Source/WebCore/Modules/webaudio/AnalyserNode.cpp
@@ -30,11 +30,10 @@
 
 #include "AudioNodeInput.h"
 #include "AudioNodeOutput.h"
-#include "ExceptionCode.h"
 
 namespace WebCore {
 
-AnalyserNode::AnalyserNode(AudioContext* context, float sampleRate)
+AnalyserNode::AnalyserNode(AudioContext& context, float sampleRate)
     : AudioBasicInspectorNode(context, sampleRate, 2)
 {
     setNodeType(NodeTypeAnalyser);
@@ -72,40 +71,38 @@ void AnalyserNode::reset()
     m_analyser.reset();
 }
 
-void AnalyserNode::setFftSize(unsigned size, ExceptionCode& ec)
+ExceptionOr<void> AnalyserNode::setFftSize(unsigned size)
 {
     if (!m_analyser.setFftSize(size))
-        ec = INDEX_SIZE_ERR;
+        return Exception { INDEX_SIZE_ERR };
+    return { };
 }
 
-void AnalyserNode::setMinDecibels(double k, ExceptionCode& ec)
+ExceptionOr<void> AnalyserNode::setMinDecibels(double k)
 {
-    if (k > maxDecibels()) {
-        ec = INDEX_SIZE_ERR;
-        return;
-    }
+    if (k > maxDecibels())
+        return Exception { INDEX_SIZE_ERR };
 
     m_analyser.setMinDecibels(k);
+    return { };
 }
 
-void AnalyserNode::setMaxDecibels(double k, ExceptionCode& ec)
+ExceptionOr<void> AnalyserNode::setMaxDecibels(double k)
 {
-    if (k < minDecibels()) {
-        ec = INDEX_SIZE_ERR;
-        return;
-    }
+    if (k < minDecibels())
+        return Exception { INDEX_SIZE_ERR };
 
     m_analyser.setMaxDecibels(k);
+    return { };
 }
 
-void AnalyserNode::setSmoothingTimeConstant(double k, ExceptionCode& ec)
+ExceptionOr<void> AnalyserNode::setSmoothingTimeConstant(double k)
 {
-    if (k < 0 || k > 1) {
-        ec = INDEX_SIZE_ERR;
-        return;
-    }
+    if (k < 0 || k > 1)
+        return Exception { INDEX_SIZE_ERR };
 
     m_analyser.setSmoothingTimeConstant(k);
+    return { };
 }
 
 } // namespace WebCore