Move the exception logic to the AudioNode creator

third_party/WebKit/Source/modules/webaudio/DelayNode.cpp

 /*
  * Copyright (C) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 16 matching lines @@
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "modules/webaudio/AudioBasicProcessorHandler.h"
 #include "modules/webaudio/DelayProcessor.h"
 #include "wtf/MathExtras.h"
 
 namespace blink {
 
 const double maximumAllowedDelayTime = 180;
 
-DelayNode::DelayNode(AbstractAudioContext& context, float sampleRate, double maxDelayTime)
+DelayNode::DelayNode(AbstractAudioContext& context, double maxDelayTime)
     : AudioNode(context)
     , m_delayTime(AudioParam::create(context, ParamTypeDelayDelayTime, 0.0))
 {
-    setHandler(AudioBasicProcessorHandler::create(AudioHandler::NodeTypeDelay, *this, sampleRate, adoptPtr(new DelayProcessor(sampleRate, 1, m_delayTime->handler(), maxDelayTime))));
+    setHandler(AudioBasicProcessorHandler::create(
+        AudioHandler::NodeTypeDelay,
+        *this,
+        context.sampleRate(),
+        adoptPtr(new DelayProcessor(
+            context.sampleRate(),
+            1,
+            m_delayTime->handler(),
+            maxDelayTime))));
 }
 
-DelayNode* DelayNode::create(AbstractAudioContext& context, float sampleRate, double maxDelayTime, ExceptionState& exceptionState)
+DelayNode* DelayNode::create(AbstractAudioContext& context, ExceptionState& exceptionState)
 {
+    ASSERT(isMainThread());

[hongchan, 2016/05/13 01:20:11]

DCHECK.

[Raymond Toy, 2016/05/20 23:12:00]

Done.

+
+    const double defaultMaxDelayTime = 1;
+    return create(context, defaultMaxDelayTime, exceptionState);
+}
+
+DelayNode* DelayNode::create(AbstractAudioContext& context, double maxDelayTime, ExceptionState& exceptionState)
+{
+    ASSERT(isMainThread());

[hongchan, 2016/05/13 01:20:11]

DCHECK.

[Raymond Toy, 2016/05/20 23:12:00]

Done.

+
+    if (context.isContextClosed()) {
+        context.throwExceptionForClosedState(exceptionState);
+        return nullptr;
+    }
+
     if (maxDelayTime <= 0 || maxDelayTime >= maximumAllowedDelayTime) {
         exceptionState.throwDOMException(
             NotSupportedError,
             ExceptionMessages::indexOutsideRange(
                 "max delay time",
                 maxDelayTime,
                 0.0,
                 ExceptionMessages::ExclusiveBound,
                 maximumAllowedDelayTime,
                 ExceptionMessages::ExclusiveBound));
         return nullptr;
     }
-    return new DelayNode(context, sampleRate, maxDelayTime);
+
+    return new DelayNode(context, maxDelayTime);
 }
 
 AudioParam* DelayNode::delayTime()
 {
     return m_delayTime;
 }
 
 DEFINE_TRACE(DelayNode)
 {
     visitor->trace(m_delayTime);
     AudioNode::trace(visitor);
 }
 
 } // namespace blink