Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / webaudio / WaveShaperNode.cpp

diff --git a/src/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.cpp b/src/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.cpp
index 7e20645..b8d895a 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.cpp
+++ b/src/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.cpp
@@ -28,18 +28,17 @@
 
 #include "modules/webaudio/WaveShaperNode.h"
 
-#include "bindings/v8/ExceptionMessages.h"
-#include "bindings/v8/ExceptionState.h"
+#include "bindings/core/v8/ExceptionMessages.h"
+#include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "wtf/MainThread.h"
 
-namespace WebCore {
+namespace blink {
 
 WaveShaperNode::WaveShaperNode(AudioContext* context)
     : AudioBasicProcessorNode(context, context->sampleRate())
 {
-    ScriptWrappable::init(this);
-    m_processor = adoptPtr(new WaveShaperProcessor(context->sampleRate(), 1));
+    m_processor = new WaveShaperProcessor(context->sampleRate(), 1);
     setNodeType(NodeTypeWaveShaper);
 
     initialize();
@@ -56,7 +55,7 @@ Float32Array* WaveShaperNode::curve()
     return waveShaperProcessor()->curve();
 }
 
-void WaveShaperNode::setOversample(const String& type, ExceptionState& es)
+void WaveShaperNode::setOversample(const String& type, ExceptionState& exceptionState)
 {
     ASSERT(isMainThread());
 
@@ -72,12 +71,7 @@ void WaveShaperNode::setOversample(const String& type, ExceptionState& es)
     } else if (type == "4x") {
         waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSample4x);
     } else {
-        es.throwDOMException(
-            InvalidStateError,
-            ExceptionMessages::failedToSet(
-                "oversample",
-                "WaveShaperNode",
-                "invalid oversample '" + type + "': must be 'none', '2x', or '4x'."));
+        ASSERT_NOT_REACHED();
     }
 }
 
@@ -96,6 +90,6 @@ String WaveShaperNode::oversample() const
     }
 }
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // ENABLE(WEB_AUDIO)